mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-05 15:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 561a4cfcce
18 changed files with 87 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View file

@ -55,7 +55,6 @@ void GameCubePane::CreateWidgets()
ipl_box->setLayout(ipl_layout);
m_skip_main_menu = new QCheckBox(tr("Skip Main Menu"), ipl_box);
m_override_language_ntsc = new QCheckBox(tr("Override Language on NTSC Games"), ipl_box);
m_language_combo = new QComboBox(ipl_box);
m_language_combo->setCurrentIndex(-1);
@ -70,7 +69,6 @@ void GameCubePane::CreateWidgets()
ipl_layout->addWidget(m_skip_main_menu, 0, 0);
ipl_layout->addWidget(new QLabel(tr("System Language:")), 1, 0);
ipl_layout->addWidget(m_language_combo, 1, 1);
ipl_layout->addWidget(m_override_language_ntsc, 2, 0);
// Device Settings
QGroupBox* device_box = new QGroupBox(tr("Device Settings"), this);
@ -133,7 +131,6 @@ void GameCubePane::ConnectWidgets()
connect(m_skip_main_menu, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
connect(m_language_combo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&GameCubePane::SaveSettings);
connect(m_override_language_ntsc, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
// Device Settings
for (int i = 0; i < SLOT_COUNT; i++)
@ -301,7 +298,6 @@ void GameCubePane::LoadSettings()
// IPL Settings
m_skip_main_menu->setChecked(params.bHLE_BS2);
m_language_combo->setCurrentIndex(m_language_combo->findData(params.SelectedLanguage));
m_override_language_ntsc->setChecked(params.bOverrideGCLanguage);
bool have_menu = false;
@ -342,9 +338,6 @@ void GameCubePane::SaveSettings()
Config::SetBaseOrCurrent(Config::MAIN_SKIP_IPL, m_skip_main_menu->isChecked());
params.SelectedLanguage = m_language_combo->currentData().toInt();
Config::SetBaseOrCurrent(Config::MAIN_GC_LANGUAGE, m_language_combo->currentData().toInt());
params.bOverrideGCLanguage = m_override_language_ntsc->isChecked();
Config::SetBaseOrCurrent(Config::MAIN_OVERRIDE_GC_LANGUAGE,
m_override_language_ntsc->isChecked());
for (int i = 0; i < SLOT_COUNT; i++)
{