ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8519 from JosJuice/setupwiimemory-region-override 

Boot: Optionally allow preserving region settings in setting.txt
This commit is contained in:
Connor McLaughlin 2019-12-19 20:47:56 +10:00 committed by GitHub
parent 6f5d770bdd 208c6a3011
commit 74dedc57fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Boot/Boot.h
View File

@ -26,10 +26,10 @@ class IOFile;
struct RegionSetting
{
const std::string area;
const std::string video;
const std::string game;
const std::string code;
std::string area;
std::string video;
std::string game;
std::string code;
};
class BootExecutableReader;

7
Source/Core/Core/Boot/Boot_BS2Emu.cpp
View File

@ -233,7 +233,7 @@ bool CBoot::SetupWiiMemory(IOS::HLE::IOSC::ConsoleType console_type)
{DiscIO::Region::PAL, {"EUR", "PAL", "EU", "LE"}},
{DiscIO::Region::NTSC_K, {"KOR", "NTSC", "KR", "LKH"}}};
auto entryPos = region_settings.find(SConfig::GetInstance().m_region);
const RegionSetting& region_setting = entryPos->second;
RegionSetting region_setting = entryPos->second;
Common::SettingsHandler gen;
std::string serno;
@ -250,6 +250,11 @@ bool CBoot::SetupWiiMemory(IOS::HLE::IOSC::ConsoleType console_type)
{
gen.SetBytes(std::move(data));
serno = gen.GetValue("SERNO");
if (SConfig::GetInstance().bOverrideRegionSettings)
{
region_setting = RegionSetting{gen.GetValue("AREA"), gen.GetValue("VIDEO"),
gen.GetValue("GAME"), gen.GetValue("CODE")};
}
gen.Reset();
}
}