From 84308ef54faa69543ff6fa2dd7777dd425d1996b Mon Sep 17 00:00:00 2001 From: oddMLan Date: Mon, 1 Jul 2024 21:16:00 -0700 Subject: [PATCH] Add Overclock Modifier to Defaults --- Source/Project64-core/Settings.cpp | 4 ++- Source/Project64-core/Settings/SettingsID.h | 2 ++ .../Settings/SettingsPage-Defaults.cpp | 3 ++ .../Settings/SettingsPage-Defaults.h | 1 + Source/Project64/UserInterface/UIResources.rc | 30 ++++++++++--------- Source/Project64/UserInterface/resource.h | 1 + 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp index 1fdf542a0..172de89d0 100644 --- a/Source/Project64-core/Settings.cpp +++ b/Source/Project64-core/Settings.cpp @@ -141,6 +141,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Default_FixedAudio, new CSettingTypeApplication("Defaults", "Fixed Audio", true)); AddHandler(Default_RandomizeSIPIInterrupts, new CSettingTypeApplication("Defaults", "Randomize SI/PI Interrupts", true)); AddHandler(Default_DiskSeekTiming, new CSettingTypeApplication("Defaults", "Disk Seek Timing", (uint32_t)DiskSeek_Turbo)); + AddHandler(Default_OverClockModifier, new CSettingTypeApplication("Defaults", "OverClockModifier", (uint32_t)1)); AddHandler(Rdb_GoodName, new CSettingTypeRomDatabase("Good Name", Game_GameName)); AddHandler(Rdb_RPCKey, new CSettingTypeRomDatabase("RPC Key", Game_RPCKey)); @@ -183,6 +184,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Rdb_UnalignedDMA, new CSettingTypeRomDatabase("Unaligned DMA", false)); AddHandler(Rdb_RandomizeSIPIInterrupts, new CSettingTypeRomDatabase("Randomize SI/PI Interrupts", Default_RandomizeSIPIInterrupts)); AddHandler(Rdb_DiskSeekTiming, new CSettingTypeRomDatabase("DiskSeekTiming", Default_DiskSeekTiming)); + AddHandler(Rdb_OverClockModifier, new CSettingTypeRomDatabase("OverClockModifier", Default_OverClockModifier)); AddHandler(Game_IniKey, new CSettingTypeTempString("")); AddHandler(Game_File, new CSettingTypeTempString("")); @@ -239,7 +241,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Game_Transferpak_ROM, new CSettingTypeGame("Tpak-ROM-dir", Default_None)); AddHandler(Game_Transferpak_Sav, new CSettingTypeGame("Tpak-Sav-dir", Default_None)); AddHandler(Game_LoadSaveAtStart, new CSettingTypeTempBool(false)); - AddHandler(Game_OverClockModifier, new CSettingTypeGame("OverClockModifier", (uint32_t)1)); + AddHandler(Game_OverClockModifier, new CSettingTypeGame("OverClockModifier", Rdb_OverClockModifier)); AddHandler(Game_FullSpeed, new CSettingTypeTempBool(true, "Full Speed")); AddHandler(Game_UnalignedDMA, new CSettingTypeGame("Unaligned DMA", Rdb_UnalignedDMA)); AddHandler(Game_RandomizeSIPIInterrupts, new CSettingTypeGame("Randomize SI/PI Interrupts", Rdb_RandomizeSIPIInterrupts)); diff --git a/Source/Project64-core/Settings/SettingsID.h b/Source/Project64-core/Settings/SettingsID.h index b3c1a203f..9d7667216 100644 --- a/Source/Project64-core/Settings/SettingsID.h +++ b/Source/Project64-core/Settings/SettingsID.h @@ -76,6 +76,7 @@ enum SettingID Default_FixedAudio, Default_RandomizeSIPIInterrupts, Default_DiskSeekTiming, + Default_OverClockModifier, // RDB settings Rdb_GoodName, @@ -115,6 +116,7 @@ enum SettingID Rdb_RandomizeSIPIInterrupts, Rdb_RPCKey, Rdb_DiskSeekTiming, + Rdb_OverClockModifier, // Individual game settings Game_IniKey, diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp index 60235a81e..6cf94cb57 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp @@ -20,6 +20,7 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay) SetDlgItemText(IDC_SYNC_AUDIO, wGS(ROM_SYNC_AUDIO).c_str()); SetDlgItemText(IDC_RANDOMIZE_SIPI_INTERRUPTS, wGS(ROM_RANDOMIZE_SIPI_INTERRUPTS).c_str()); SetDlgItemText(IDC_DISKSEEKTIMING_TEXT1, wGS(ROM_DISK_SEEK_TIMING).c_str()); + SetDlgItemText(IDC_OVER_CLOCK_MODIFIER_TEXT2, wGS(ROM_OVER_CLOCK_MODIFIER).c_str()); CModifiedComboBox * ComboBox; ComboBox = AddModComboBox(GetDlgItem(IDC_RDRAM_SIZE_KNOWN), Default_RDRamSizeUnknown); @@ -54,6 +55,8 @@ CDefaultsOptionsPage::CDefaultsOptionsPage(HWND hParent, const RECT & rcDispay) TxtBox->SetTextField(GetDlgItem(IDC_VIREFESH_TEXT)); TxtBox = AddModTextBox(GetDlgItem(IDC_COUNTPERBYTE), Default_AiCountPerBytes, false); TxtBox->SetTextField(GetDlgItem(IDC_COUNTPERBYTE_TEXT)); + TxtBox = AddModTextBox(GetDlgItem(IDC_OVER_CLOCK_MODIFIER), Default_OverClockModifier, false); + TxtBox->SetTextField(GetDlgItem(IDC_OVER_CLOCK_MODIFIER_TEXT2)); AddModCheckBox(GetDlgItem(IDC_HLE_GFX), Default_UseHleGfx); AddModCheckBox(GetDlgItem(IDC_SYNC_AUDIO), Default_SyncViaAudio); diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h index 9446d279b..678ddafe4 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h @@ -17,6 +17,7 @@ class CDefaultsOptionsPage : COMMAND_HANDLER_EX(IDC_VIREFRESH, EN_UPDATE, EditBoxChanged); COMMAND_HANDLER_EX(IDC_COUNTPERBYTE, EN_UPDATE, EditBoxChanged); COMMAND_HANDLER_EX(IDC_RDRAM_SIZE, EN_UPDATE, EditBoxChanged); + COMMAND_HANDLER_EX(IDC_OVER_CLOCK_MODIFIER, EN_UPDATE, EditBoxChanged); } END_MSG_MAP() diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc index 5cb07daaf..f650efd92 100644 --- a/Source/Project64/UserInterface/UIResources.rc +++ b/Source/Project64/UserInterface/UIResources.rc @@ -1232,21 +1232,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Memory Size (Known):",IDC_MEMORY_SIZE_KNOWN_TEXT,6,8,91,10 COMBOBOX IDC_RDRAM_SIZE_KNOWN,102,6,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Memory Size (Unknown):",IDC_MEMORY_SIZE_UNKOWN_TEXT,6,23,91,10 - COMBOBOX IDC_RDRAM_SIZE_UNKNOWN,102,21,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Counter Factor:",IDC_COUNTFACT_TEXT,6,37,91,10 - COMBOBOX IDC_COUNTFACT,102,36,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,53,91,10 - EDITTEXT IDC_VIREFRESH,102,51,109,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,67,91,10 - EDITTEXT IDC_COUNTPERBYTE,102,66,109,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Disk Seek Timing:",IDC_DISKSEEKTIMING_TEXT1,6,82,91,10 - COMBOBOX IDC_DISKSEEKTIMING,102,80,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,95,91,10 - CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,95,91,10 - CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,107,91,10 + LTEXT "Memory Size (Unknown):",IDC_MEMORY_SIZE_UNKOWN_TEXT,6,25,91,10 + COMBOBOX IDC_RDRAM_SIZE_UNKNOWN,102,22,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Counter Factor:",IDC_COUNTFACT_TEXT,6,40,91,10 + COMBOBOX IDC_COUNTFACT,102,38,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,56,91,10 + EDITTEXT IDC_VIREFRESH,102,54,109,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,71,91,10 + EDITTEXT IDC_COUNTPERBYTE,102,69,109,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Disk Seek Timing:",IDC_DISKSEEKTIMING_TEXT1,6,101,91,10 + COMBOBOX IDC_DISKSEEKTIMING,102,99,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,117,91,10 + CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,117,91,10 + CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,129,91,10 CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,107,107,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,129,107,10 + LTEXT "Overclock modifier:",IDC_OVER_CLOCK_MODIFIER_TEXT2,6,86,91,10 + EDITTEXT IDC_OVER_CLOCK_MODIFIER,102,84,109,12,ES_AUTOHSCROLL | ES_NUMBER END IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214 diff --git a/Source/Project64/UserInterface/resource.h b/Source/Project64/UserInterface/resource.h index b69cdb6c9..5e50c90d6 100644 --- a/Source/Project64/UserInterface/resource.h +++ b/Source/Project64/UserInterface/resource.h @@ -261,6 +261,7 @@ #define IDC_DIR_TEXTURE_FRAME 1102 #define IDC_ENTER_CODE 1102 #define IDC_DESCRIPTION 1102 +#define IDC_OVER_CLOCK_MODIFIER_TEXT2 1102 #define IDC_DIR_FRAME3 1103 #define IDC_OVER_CLOCK_MODIFIER 1103 #define IDC_REQUEST_DESCPTION 1103