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 #4582 from iwubcode/per_game_wii_lang 

Add support for specifying the GC/Wii system language per-game
This commit is contained in:
Matthew Parlane 2017-01-23 11:51:37 +13:00 committed by GitHub
parent ef7a809fad a7a8e35823
commit ba5c3f4c46
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/BootManager.cpp
View File

@ -83,6 +83,7 @@ private:
int iSelectedLanguage; int iSelectedLanguage;
int iCPUCore; int iCPUCore;
int Volume; int Volume;
int m_wii_language;
float m_EmulationSpeed; float m_EmulationSpeed;
std::string strBackend; std::string strBackend;
std::string sBackend; std::string sBackend;
@ -117,6 +118,7 @@ void ConfigCache::SaveConfig(const SConfig& config)
strBackend = config.m_strVideoBackend; strBackend = config.m_strVideoBackend;
sBackend = config.sBackend; sBackend = config.sBackend;
m_strGPUDeterminismMode = config.m_strGPUDeterminismMode; m_strGPUDeterminismMode = config.m_strGPUDeterminismMode;
m_wii_language = config.m_wii_language;
std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource)); std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource));
std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads)); std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads));
@ -168,6 +170,8 @@ void ConfigCache::RestoreConfig(SConfig* config)
WiimoteReal::ChangeWiimoteSource(i, iWiimoteSource[i]); WiimoteReal::ChangeWiimoteSource(i, iWiimoteSource[i]);
} }
} }
config->m_wii_language = m_wii_language;
} }
for (unsigned int i = 0; i < MAX_SI_CHANNELS; ++i) for (unsigned int i = 0; i < MAX_SI_CHANNELS; ++i)
@ -252,6 +256,7 @@ bool BootCore(const std::string& _rFilename)
core_section->Get("HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2); core_section->Get("HLE_BS2", &StartUp.bHLE_BS2, StartUp.bHLE_BS2);
core_section->Get("ProgressiveScan", &StartUp.bProgressive, StartUp.bProgressive); core_section->Get("ProgressiveScan", &StartUp.bProgressive, StartUp.bProgressive);
core_section->Get("PAL60", &StartUp.bPAL60, StartUp.bPAL60); core_section->Get("PAL60", &StartUp.bPAL60, StartUp.bPAL60);
core_section->Get("GameCubeLanguage", &StartUp.SelectedLanguage, StartUp.SelectedLanguage);
if (core_section->Get("EmulationSpeed", &SConfig::GetInstance().m_EmulationSpeed, if (core_section->Get("EmulationSpeed", &SConfig::GetInstance().m_EmulationSpeed,
SConfig::GetInstance().m_EmulationSpeed)) SConfig::GetInstance().m_EmulationSpeed))
config_cache.bSetEmulationSpeed = true; config_cache.bSetEmulationSpeed = true;
@ -300,6 +305,9 @@ bool BootCore(const std::string& _rFilename)
g_wiimote_sources[WIIMOTE_BALANCE_BOARD] = source; g_wiimote_sources[WIIMOTE_BALANCE_BOARD] = source;
WiimoteReal::ChangeWiimoteSource(WIIMOTE_BALANCE_BOARD, source); WiimoteReal::ChangeWiimoteSource(WIIMOTE_BALANCE_BOARD, source);
} }
IniFile::Section* wii_section = game_ini.GetOrCreateSection("Wii");
wii_section->Get("Language", &StartUp.m_wii_language, StartUp.m_wii_language);
} }
} }