piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Config: Move ToGameCubeRegion(), GetDirectoryForRegion(), and GetBootROMPath() to new config system namespace.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2022-04-11 06:08:19 +02:00
parent 664663e8de
commit 2081e2f2a1
10 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/Boot/Boot.cpp
View File

@ -311,8 +311,8 @@ std::unique_ptr<BootParameters> BootParameters::GenerateFromFile(std::vector<std
BootParameters::IPL::IPL(DiscIO::Region region_) : region(region_)
{
const std::string directory = SConfig::GetInstance().GetDirectoryForRegion(region);
path = SConfig::GetInstance().GetBootROMPath(directory);
const std::string directory = Config::GetDirectoryForRegion(region);
path = Config::GetBootROMPath(directory);
}
BootParameters::IPL::IPL(DiscIO::Region region_, Disc&& disc_) : IPL(region_)
@ -434,7 +434,7 @@ bool CBoot::Load_BS2(const std::string& boot_rom_filename)
if (known_ipl && pal_ipl != (boot_region == DiscIO::Region::PAL))
{
PanicAlertFmtT("{0} IPL found in {1} directory. The disc might not be recognized",
pal_ipl ? "PAL" : "NTSC", SConfig::GetDirectoryForRegion(boot_region));
pal_ipl ? "PAL" : "NTSC", Config::GetDirectoryForRegion(boot_region));
}
// Run the descrambler over the encrypted section containing BS1/BS2