mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 11:49:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4544 from JosJuice/region-enum

Browse source 
DiscIO: Add GetRegion function and Region enum
This commit is contained in:
Matthew Parlane 2017-01-13 09:19:27 +13:00 • committed by GitHub
commit d346d4ced1
32 changed files with 264 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/Core/ConfigManager.h
View file

@ -16,6 +16,7 @@
namespace DiscIO
{
enum class Language;
enum class Region;
}
// DSP Backend Types
@ -92,7 +93,6 @@ struct SConfig : NonCopyable
bool bDSPThread = false;
bool bDSPHLE = true;
bool bSyncGPUOnSkipIdleHack = true;
bool bNTSC = false;
bool bForceNTSCJ = false;
bool bHLE_BS2 = true;
bool bEnableCheats = false;
@ -183,7 +183,9 @@ struct SConfig : NonCopyable
BOOT_BS2,
BOOT_DFF
};
EBootType m_BootType;
DiscIO::Region m_region;
std::string m_strVideoBackend;
std::string m_strGPUDeterminismMode;
@ -206,6 +208,7 @@ struct SConfig : NonCopyable
std::string m_perfDir;
void LoadDefaults();
static const char* GetDirectoryForRegion(DiscIO::Region region);
bool AutoSetup(EBootBS2 _BootBS2);
const std::string& GetGameID() const { return m_strGameID; }
void CheckMemcardPath(std::string& memcardPath, const std::string& gameRegion, bool isSlotA);