Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-09-28 05:06:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

DiscIO: Add GetRegion function and Region enum

Browse Source 
Instead of needing different switch cases for
converting countries to regions in multiple places,
we now only need a single country-to-region switch case
(in DiscIO/Enums.cpp), and we get a nice Region type.
This commit is contained in:
JosJuice
2016-12-23 18:41:21 +01:00
parent 6aef0630f7
commit 66ea9f5cc1
26 changed files with 218 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,7 +419,7 @@ bool CBoot::BootUp()
// Poor man's bootup
if (_StartupPara.bWii)
SetupWiiMemory(DiscIO::Country::COUNTRY_UNKNOWN);
SetupWiiMemory(DiscIO::Region::UNKNOWN_REGION);
else
EmulatedBS2_GC(true);

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

@@ -9,10 +9,10 @@
namespace DiscIO
{
enum class Country;
enum class Region;
}
struct CountrySetting
struct RegionSetting
{
const std::string area;
const std::string video;
@@ -57,5 +57,5 @@ private:
static bool Load_BS2(const std::string& _rBootROMFilename);
static void Load_FST(bool _bIsWii);
static bool SetupWiiMemory(DiscIO::Country country);
static bool SetupWiiMemory(DiscIO::Region region);
};

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

@@ -181,28 +181,22 @@ bool CBoot::EmulatedBS2_GC(bool skipAppLoader)
return true;
}
bool CBoot::SetupWiiMemory(DiscIO::Country country)
bool CBoot::SetupWiiMemory(DiscIO::Region region)
{
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<DiscIO::Country, const CountrySetting> country_settings = {
{DiscIO::Country::COUNTRY_EUROPE, SETTING_EUROPE},
{DiscIO::Country::COUNTRY_USA, SETTING_USA},
{DiscIO::Country::COUNTRY_JAPAN, SETTING_JAPAN},
{DiscIO::Country::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::Country::COUNTRY_TAIWAN, SETTING_JAPAN}};
auto entryPos = country_settings.find(country);
const CountrySetting& country_setting =
(entryPos != country_settings.end()) ?
static const RegionSetting SETTING_NTSC_J = {"JPN", "NTSC", "JP", "LJ"};
static const RegionSetting SETTING_NTSC_U = {"USA", "NTSC", "US", "LU"};
static const RegionSetting SETTING_PAL = {"EUR", "PAL", "EU", "LE"};
static const RegionSetting SETTING_NTSC_K = {"KOR", "NTSC", "KR", "LKH"};
static const std::map<DiscIO::Region, const RegionSetting> region_settings = {
{DiscIO::Region::NTSC_J, SETTING_NTSC_J},
{DiscIO::Region::NTSC_U, SETTING_NTSC_U},
{DiscIO::Region::PAL, SETTING_PAL},
{DiscIO::Region::NTSC_K, SETTING_NTSC_K}};
auto entryPos = region_settings.find(region);
const RegionSetting& region_setting =
(entryPos != region_settings.end()) ?
entryPos->second :
(SConfig::GetInstance().bNTSC ?
SETTING_USA :
SETTING_EUROPE); // default to USA or EUR depending on game's video mode
(SConfig::GetInstance().bNTSC ? SETTING_NTSC_U : SETTING_PAL);
SettingsHandler gen;
std::string serno;
@@ -233,15 +227,15 @@ bool CBoot::SetupWiiMemory(DiscIO::Country country)
INFO_LOG(BOOT, "Using serial number: %s", serno.c_str());
}
std::string model = "RVL-001(" + country_setting.area + ")";
gen.AddSetting("AREA", country_setting.area);
std::string model = "RVL-001(" + region_setting.area + ")";
gen.AddSetting("AREA", region_setting.area);
gen.AddSetting("MODEL", model);
gen.AddSetting("DVD", "0");
gen.AddSetting("MPCH", "0x7FFE");
gen.AddSetting("CODE", country_setting.code);
gen.AddSetting("CODE", region_setting.code);
gen.AddSetting("SERNO", serno);
gen.AddSetting("VIDEO", country_setting.video);
gen.AddSetting("GAME", country_setting.game);
gen.AddSetting("VIDEO", region_setting.video);
gen.AddSetting("GAME", region_setting.game);
File::CreateFullPath(settings_Filename);
{
@@ -336,10 +330,10 @@ bool CBoot::EmulatedBS2_Wii()
INFO_LOG(BOOT, "Faking Wii BS2...");
// Setup Wii memory
DiscIO::Country country_code = DiscIO::Country::COUNTRY_UNKNOWN;
DiscIO::Region region_code = DiscIO::Region::UNKNOWN_REGION;
if (DVDInterface::VolumeIsValid())
country_code = DVDInterface::GetVolume().GetCountry();
if (SetupWiiMemory(country_code) == false)
region_code = DVDInterface::GetVolume().GetRegion();
if (SetupWiiMemory(region_code) == false)
return false;
// Execute the apploader

4
Source/Core/Core/Boot/Boot_WiiWAD.cpp
View File

@@ -89,10 +89,10 @@ bool CBoot::Boot_WiiWAD(const std::string& _pFilename)
if (titleID == TITLEID_SYSMENU)
HLE_IPC_CreateVirtualFATFilesystem();
// setup Wii memory
if (!SetupWiiMemory(ContentLoader.GetCountry()))
if (!SetupWiiMemory(ContentLoader.GetRegion()))
return false;
// this sets a bit that is used to detect NTSC-J
if (ContentLoader.GetCountry() == DiscIO::Country::COUNTRY_JAPAN)
if (ContentLoader.GetRegion() == DiscIO::Region::NTSC_J)
{
VideoInterface::SetRegionReg('J');
}