diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.cpp index 4d53dd313..0c3ea20ea 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.cpp +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.cpp @@ -15,83 +15,83 @@ CGameRecompilePage::CGameRecompilePage(HWND hParent, const RECT & rcDispay) { - if (!Create(hParent, rcDispay)) - { - return; - } + if (!Create(hParent, rcDispay)) + { + return; + } - //Set the text for all gui Items - SetDlgItemTextW(m_hWnd, IDC_CPU_TYPE_TEXT, GS(ROM_CPU_STYLE)); - SetDlgItemTextW(m_hWnd, IDC_FUNCFIND_TEXT, GS(ROM_FUNC_FIND)); + //Set the text for all gui Items + SetDlgItemTextW(m_hWnd, IDC_CPU_TYPE_TEXT, GS(ROM_CPU_STYLE)); + SetDlgItemTextW(m_hWnd, IDC_FUNCFIND_TEXT, GS(ROM_FUNC_FIND)); - SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); - SetDlgItemTextW(m_hWnd, IDC_BLOCK_LINKING, GS(ADVANCE_ABL)); - SetDlgItemTextW(m_hWnd, IDC_ROM_FASTSP, GS(ROM_FAST_SP)); + SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); + SetDlgItemTextW(m_hWnd, IDC_BLOCK_LINKING, GS(ADVANCE_ABL)); + SetDlgItemTextW(m_hWnd, IDC_ROM_FASTSP, GS(ROM_FAST_SP)); - SetDlgItemTextW(m_hWnd, IDC_SMM_FRAME, GS(ADVANCE_SMCM)); - SetDlgItemTextW(m_hWnd, IDC_SMM_CACHE, GS(ADVANCE_SMM_CACHE)); - SetDlgItemTextW(m_hWnd, IDC_SMM_DMA, GS(ADVANCE_SMM_PIDMA)); - SetDlgItemTextW(m_hWnd, IDC_SMM_VALIDATE, GS(ADVANCE_SMM_VALIDATE)); - SetDlgItemTextW(m_hWnd, IDC_SMM_TLB, GS(ADVANCE_SMM_TLB)); - SetDlgItemTextW(m_hWnd, IDC_SMM_PROTECT, GS(ADVANCE_SMM_PROTECT)); + SetDlgItemTextW(m_hWnd, IDC_SMM_FRAME, GS(ADVANCE_SMCM)); + SetDlgItemTextW(m_hWnd, IDC_SMM_CACHE, GS(ADVANCE_SMM_CACHE)); + SetDlgItemTextW(m_hWnd, IDC_SMM_DMA, GS(ADVANCE_SMM_PIDMA)); + SetDlgItemTextW(m_hWnd, IDC_SMM_VALIDATE, GS(ADVANCE_SMM_VALIDATE)); + SetDlgItemTextW(m_hWnd, IDC_SMM_TLB, GS(ADVANCE_SMM_TLB)); + SetDlgItemTextW(m_hWnd, IDC_SMM_PROTECT, GS(ADVANCE_SMM_PROTECT)); - m_SelfModGroup.Attach(GetDlgItem(IDC_SMM_FRAME)); + m_SelfModGroup.Attach(GetDlgItem(IDC_SMM_FRAME)); - AddModCheckBox(GetDlgItem(IDC_ROM_REGCACHE), Game_RegCache); - AddModCheckBox(GetDlgItem(IDC_BLOCK_LINKING), Game_BlockLinking); - AddModCheckBox(GetDlgItem(IDC_SMM_CACHE), Game_SMM_Cache); - AddModCheckBox(GetDlgItem(IDC_SMM_DMA), Game_SMM_PIDMA); - AddModCheckBox(GetDlgItem(IDC_SMM_VALIDATE), Game_SMM_ValidFunc); - AddModCheckBox(GetDlgItem(IDC_SMM_TLB), Game_SMM_TLB); - AddModCheckBox(GetDlgItem(IDC_SMM_PROTECT), Game_SMM_Protect); - ::ShowWindow(GetDlgItem(IDC_SMM_STORE), SW_HIDE); - //AddModCheckBox(GetDlgItem(IDC_SMM_STORE),Game_SMM_StoreInstruc); - AddModCheckBox(GetDlgItem(IDC_ROM_FASTSP), Game_FastSP); + AddModCheckBox(GetDlgItem(IDC_ROM_REGCACHE), Game_RegCache); + AddModCheckBox(GetDlgItem(IDC_BLOCK_LINKING), Game_BlockLinking); + AddModCheckBox(GetDlgItem(IDC_SMM_CACHE), Game_SMM_Cache); + AddModCheckBox(GetDlgItem(IDC_SMM_DMA), Game_SMM_PIDMA); + AddModCheckBox(GetDlgItem(IDC_SMM_VALIDATE), Game_SMM_ValidFunc); + AddModCheckBox(GetDlgItem(IDC_SMM_TLB), Game_SMM_TLB); + AddModCheckBox(GetDlgItem(IDC_SMM_PROTECT), Game_SMM_Protect); + ::ShowWindow(GetDlgItem(IDC_SMM_STORE), SW_HIDE); + //AddModCheckBox(GetDlgItem(IDC_SMM_STORE),Game_SMM_StoreInstruc); + AddModCheckBox(GetDlgItem(IDC_ROM_FASTSP), Game_FastSP); - CModifiedComboBox * ComboBox; - ComboBox = AddModComboBox(GetDlgItem(IDC_CPU_TYPE), Game_CpuType); - if (ComboBox) - { - ComboBox->AddItemW(GS(CORE_RECOMPILER), CPU_Recompiler); - ComboBox->AddItemW(GS(CORE_INTERPTER), CPU_Interpreter); - if (g_Settings->LoadBool(Debugger_Enabled)) - { - ComboBox->AddItemW(GS(CORE_SYNC), CPU_SyncCores); - } - } + CModifiedComboBox * ComboBox; + ComboBox = AddModComboBox(GetDlgItem(IDC_CPU_TYPE), Game_CpuType); + if (ComboBox) + { + ComboBox->AddItemW(GS(CORE_RECOMPILER), CPU_Recompiler); + ComboBox->AddItemW(GS(CORE_INTERPTER), CPU_Interpreter); + if (g_Settings->LoadBool(Debugger_Enabled)) + { + ComboBox->AddItemW(GS(CORE_SYNC), CPU_SyncCores); + } + } - ComboBox = AddModComboBox(GetDlgItem(IDC_FUNCFIND), Game_FuncLookupMode); - if (ComboBox) - { - ComboBox->AddItemW(GS(FLM_PLOOKUP), FuncFind_PhysicalLookup); - ComboBox->AddItemW(GS(FLM_VLOOKUP), FuncFind_VirtualLookup); - //ComboBox->AddItem(GS(FLM_CHANGEMEM), FuncFind_ChangeMemory); - } - UpdatePageSettings(); + ComboBox = AddModComboBox(GetDlgItem(IDC_FUNCFIND), Game_FuncLookupMode); + if (ComboBox) + { + ComboBox->AddItemW(GS(FLM_PLOOKUP), FuncFind_PhysicalLookup); + ComboBox->AddItemW(GS(FLM_VLOOKUP), FuncFind_VirtualLookup); + //ComboBox->AddItem(GS(FLM_CHANGEMEM), FuncFind_ChangeMemory); + } + UpdatePageSettings(); } void CGameRecompilePage::ShowPage() { - ShowWindow(SW_SHOW); + ShowWindow(SW_SHOW); } void CGameRecompilePage::HidePage() { - ShowWindow(SW_HIDE); + ShowWindow(SW_HIDE); } void CGameRecompilePage::ApplySettings(bool UpdateScreen) { - CSettingsPageImpl::ApplySettings(UpdateScreen); + CSettingsPageImpl::ApplySettings(UpdateScreen); } bool CGameRecompilePage::EnableReset(void) { - if (CSettingsPageImpl::EnableReset()) { return true; } - return false; + if (CSettingsPageImpl::EnableReset()) { return true; } + return false; } void CGameRecompilePage::ResetPage() { - CSettingsPageImpl::ResetPage(); -} + CSettingsPageImpl::ResetPage(); +} \ No newline at end of file diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h index e1ecf8476..6c0fd0988 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h @@ -11,36 +11,35 @@ #pragma once class CGameRecompilePage : - public CSettingsPageImpl, - public CSettingsPage + public CSettingsPageImpl, + public CSettingsPage { + BEGIN_MSG_MAP_EX(CGameRecompilePage) + COMMAND_HANDLER_EX(IDC_CPU_TYPE, LBN_SELCHANGE, ComboBoxChanged) + COMMAND_HANDLER_EX(IDC_FUNCFIND, LBN_SELCHANGE, ComboBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_ROM_REGCACHE, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_ROM_FASTSP, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_BLOCK_LINKING, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_SMM_CACHE, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_SMM_DMA, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_SMM_VALIDATE, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_SMM_TLB, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_SMM_PROTECT, CheckBoxChanged) + COMMAND_ID_HANDLER_EX(IDC_SMM_STORE, CheckBoxChanged) + END_MSG_MAP() - BEGIN_MSG_MAP_EX(CGameRecompilePage) - COMMAND_HANDLER_EX(IDC_CPU_TYPE,LBN_SELCHANGE,ComboBoxChanged) - COMMAND_HANDLER_EX(IDC_FUNCFIND,LBN_SELCHANGE,ComboBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_ROM_REGCACHE,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_ROM_FASTSP,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_BLOCK_LINKING,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_CACHE,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_DMA,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_VALIDATE,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_TLB,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_PROTECT,CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_STORE,CheckBoxChanged) - END_MSG_MAP() - - enum { IDD = IDD_Settings_GameRecompiler }; + enum { IDD = IDD_Settings_GameRecompiler }; public: - CGameRecompilePage(HWND hParent, const RECT & rcDispay ); + CGameRecompilePage(HWND hParent, const RECT & rcDispay); - LanguageStringID PageTitle ( void ) { return TAB_RECOMPILER; } - void HidePage ( void ); - void ShowPage ( void ); - void ApplySettings ( bool UpdateScreen ); - bool EnableReset ( void ); - void ResetPage ( void ); + LanguageStringID PageTitle(void) { return TAB_RECOMPILER; } + void HidePage(void); + void ShowPage(void); + void ApplySettings(bool UpdateScreen); + bool EnableReset(void); + void ResetPage(void); private: - CPartialGroupBox m_SelfModGroup; + CPartialGroupBox m_SelfModGroup; };