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

ConfigMain: Change _NTSC to ForceNTSCJ

Browse Source 
This is consistent with the name of the setting in dolphin.ini
This commit is contained in:
Stevoisiak
2015-03-13 17:59:30 -04:00
parent efb64c1885
commit 4f71b717cc
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/ConfigMain.cpp
View File

@ -232,7 +232,7 @@ void CConfigMain::UpdateGUI()
EnableCheats->Disable(); EnableCheats->Disable();
CPUEngine->Disable(); CPUEngine->Disable();
_NTSCJ->Disable(); ForceNTSCJ->Disable();
// Disable stuff on AudioPage // Disable stuff on AudioPage
DSPEngine->Disable(); DSPEngine->Disable();
@ -347,7 +347,7 @@ void CConfigMain::InitializeGUIValues()
for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a) for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a)
if (CPUCores[a].CPUid == startup_params.iCPUCore) if (CPUCores[a].CPUid == startup_params.iCPUCore)
CPUEngine->SetSelection(a); CPUEngine->SetSelection(a);
_NTSCJ->SetValue(startup_params.bForceNTSCJ); ForceNTSCJ->SetValue(startup_params.bForceNTSCJ);
// Display - Interface // Display - Interface
@ -480,7 +480,7 @@ void CConfigMain::InitializeGUITooltips()
Framelimit->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL).")); Framelimit->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL)."));
// General - Advanced // General - Advanced
_NTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games.")); ForceNTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games."));
// Display - Interface // Display - Interface
ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game."));
@ -547,7 +547,7 @@ void CConfigMain::CreateGUIControls()
Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit); Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit);
// Core Settings - Advanced // Core Settings - Advanced
CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS);
_NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J")); ForceNTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J"));
// Populate the General settings // Populate the General settings
wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL);
@ -562,7 +562,7 @@ void CConfigMain::CreateGUIControls()
wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings")); wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings"));
sbAdvanced->Add(CPUEngine, 0, wxALL, 5); sbAdvanced->Add(CPUEngine, 0, wxALL, 5);
sbAdvanced->Add(_NTSCJ, 0, wxALL, 5); sbAdvanced->Add(ForceNTSCJ, 0, wxALL, 5);
wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL);
sGeneralPage->Add(sbBasic, 0, wxEXPAND | wxALL, 5); sGeneralPage->Add(sbBasic, 0, wxEXPAND | wxALL, 5);
@ -906,7 +906,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event)
} }
break; break;
case ID_NTSCJ: case ID_NTSCJ:
startup_params.bForceNTSCJ = _NTSCJ->IsChecked(); startup_params.bForceNTSCJ = ForceNTSCJ->IsChecked();
break; break;
case ID_ENABLEOVERCLOCK: case ID_ENABLEOVERCLOCK:
SConfig::GetInstance().m_OCEnable = EnableOC->IsChecked(); SConfig::GetInstance().m_OCEnable = EnableOC->IsChecked();

2
Source/Core/DolphinWX/ConfigMain.h
View File

@ -146,7 +146,7 @@ private:
// Advanced // Advanced
wxRadioBox* CPUEngine; wxRadioBox* CPUEngine;
wxCheckBox* _NTSCJ; wxCheckBox* ForceNTSCJ;
wxSlider* OCSlider; wxSlider* OCSlider;
wxStaticText* OCText; wxStaticText* OCText;
wxCheckBox* EnableOC; wxCheckBox* EnableOC;