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

Replace "Override Language on NTSC Games" with "Allow Mismatched Region Settings"

Browse Source 
This new setting is like Override Language on NTSC Games, except
instead of only applying to the GameCube language setting,
it also applies to the Wii language setting.

Fixes https://bugs.dolphin-emu.org/issues/11299
This commit is contained in:
JosJuice
2019-06-30 11:48:49 +02:00
parent b88e5610ab
commit 561a4cfcce
18 changed files with 87 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@ class IniFile;
namespace DiscIO
{
enum class Country;
enum class Language;
enum class Platform;
enum class Region;
@ -141,7 +140,7 @@ struct SConfig
float fSyncGpuOverclock;
int SelectedLanguage = 0;
bool bOverrideGCLanguage = false;
bool bOverrideRegionSettings = false;
bool bWii = false;
bool m_is_mios = false;
@ -212,6 +211,7 @@ struct SConfig
bool SetPathsAndGameMetadata(const BootParameters& boot);
static DiscIO::Region GetFallbackRegion();
DiscIO::Language GetCurrentLanguage(bool wii) const;
DiscIO::Language GetLanguageAdjustedForRegion(bool wii, DiscIO::Region region) const;
IniFile LoadDefaultGameIni() const;
IniFile LoadLocalGameIni() const;
@ -365,7 +365,7 @@ private:
void LoadJitDebugSettings(IniFile& ini);
void SetRunningGameMetadata(const std::string& game_id, const std::string& gametdb_id,
u64 title_id, u16 revision, DiscIO::Country country);
u64 title_id, u16 revision, DiscIO::Region region);
static SConfig* m_Instance;