summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2015-06-04 13:55:32 +0200
committerAdmiral H. Curtiss <pikachu025@gmail.com>2015-06-05 14:35:48 +0200
commita2ca4841e903e55c4cf545f7c2039514a65e31ee (patch)
treed385faf21fa81620a50c91fe056c1785d548bdde /Source
parentf5b0468179f1c3c15cfb5957218ee9f27cb47d77 (diff)
Properly set default video mode for PAL Wii games.
See https://github.com/dolphin-emu/dolphin/pull/2520 for a more detailed explanation.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Boot/Boot.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index b941cf1c32..75d1481887 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -226,7 +226,11 @@ bool CBoot::BootUp()
NOTICE_LOG(BOOT, "Booting %s", _StartupPara.m_strFilename.c_str());
g_symbolDB.Clear();
- VideoInterface::Preset(_StartupPara.bNTSC);
+
+ // PAL Wii uses NTSC framerate and linecount in 60Hz modes
+ const bool bPAL60 = _StartupPara.bWii && SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.E60");
+ VideoInterface::Preset(_StartupPara.bNTSC || bPAL60);
+
switch (_StartupPara.m_BootType)
{
// GCM and Wii