summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2015-06-06 10:42:42 +1000
committerskidau <skidau@gmail.com>2015-06-06 10:42:42 +1000
commit2f577e147bacaa507a0878d45f844d4edd94b0aa (patch)
tree1b1753190ff1df21d1f08969f47de33b163cf690 /Source
parent63f41ce54ee882eb503427fe2ca58bcf976e78f5 (diff)
parenta2ca4841e903e55c4cf545f7c2039514a65e31ee (diff)
Merge pull request #2520 from AdmiralCurtiss/wii-pal60
Properly set default video mode for PAL Wii games.
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