From 7276d80adc35f7653fea2b479030d21266fd7ef9 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Wed, 17 Jun 2015 23:52:41 +0200 Subject: [PATCH] Boot: Decide setting.txt's country settings based on the game's video mode when no valid country code is found rather than defaulting to Europe. --- Source/Core/Core/Boot/Boot_BS2Emu.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp index a58abd1b64..854d71049c 100644 --- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp +++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp @@ -166,21 +166,24 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader) bool CBoot::SetupWiiMemory(DiscIO::IVolume::ECountry country) { static const CountrySetting SETTING_EUROPE = {"EUR", "PAL", "EU", "LE"}; + static const CountrySetting SETTING_USA = {"USA", "NTSC", "US", "LU"}; + static const CountrySetting SETTING_JAPAN = {"JPN", "NTSC", "JP", "LJ"}; + static const CountrySetting SETTING_KOREA = {"KOR", "NTSC", "KR", "LKH"}; static const std::map country_settings = { {DiscIO::IVolume::COUNTRY_EUROPE, SETTING_EUROPE}, - {DiscIO::IVolume::COUNTRY_USA, {"USA", "NTSC", "US", "LU"}}, - {DiscIO::IVolume::COUNTRY_JAPAN, {"JPN", "NTSC", "JP", "LJ"}}, - {DiscIO::IVolume::COUNTRY_KOREA, {"KOR", "NTSC", "KR", "LKH"}}, + {DiscIO::IVolume::COUNTRY_USA, SETTING_USA}, + {DiscIO::IVolume::COUNTRY_JAPAN, SETTING_JAPAN}, + {DiscIO::IVolume::COUNTRY_KOREA, SETTING_KOREA}, //TODO: Determine if Taiwan have their own specific settings. // Also determine if there are other specific settings // for other countries. - {DiscIO::IVolume::COUNTRY_TAIWAN, {"JPN", "NTSC", "JP", "LJ"}} + {DiscIO::IVolume::COUNTRY_TAIWAN, SETTING_JAPAN} }; auto entryPos = country_settings.find(country); const CountrySetting& country_setting = (entryPos != country_settings.end()) ? entryPos->second : - SETTING_EUROPE; //Default to EUROPE + (SConfig::GetInstance().bNTSC ? SETTING_USA : SETTING_EUROPE); // default to USA or EUR depending on game's video mode SettingsHandler gen; std::string serno;