From 4020735b26154832948ef2622501b5eb7cb29a56 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Sat, 16 May 2020 06:34:54 -0700 Subject: [PATCH] Add "Note: 8 MB is forced for Unknown ROMs" to Defaults tab Closes #1747 --- Source/Project64-core/Multilanguage.h | 1 + .../Multilanguage/LanguageClass.cpp | 1 + .../Settings/SettingsPage-Defaults.cpp | 1 + Source/Project64/UserInterface/UIResources.rc | 32 ++++++++++--------- Source/Project64/UserInterface/resource.h | 3 +- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Source/Project64-core/Multilanguage.h b/Source/Project64-core/Multilanguage.h index f831b31a7..deec950d0 100644 --- a/Source/Project64-core/Multilanguage.h +++ b/Source/Project64-core/Multilanguage.h @@ -335,6 +335,7 @@ enum LanguageStringID ROM_OVER_CLOCK_MODIFIER = 5400, ROM_UNALIGNED_DMA = 5410, ROM_RANDOMIZE_SIPI_INTERRUPTS = 5420, + ROM_MEM_SIZE_NOTE = 5430, //Core Styles CORE_INTERPTER = 540, diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp index 55af24d1a..29d6c67b5 100644 --- a/Source/Project64-core/Multilanguage/LanguageClass.cpp +++ b/Source/Project64-core/Multilanguage/LanguageClass.cpp @@ -301,6 +301,7 @@ void CLanguage::LoadDefaultStrings(void) DEF_STR(ROM_OVER_CLOCK_MODIFIER, "Overclock modifier:"); DEF_STR(ROM_UNALIGNED_DMA, "Unaligned DMA"); DEF_STR(ROM_RANDOMIZE_SIPI_INTERRUPTS, "Randomize SI/PI interrupts"); + DEF_STR(ROM_MEM_SIZE_NOTE, "Note: 8 MB is forced for Unknown ROMs."); //Core Styles DEF_STR(CORE_INTERPTER, "Interpreter"); diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp b/Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp index 71959a8bc..7dcc11c9b 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) UpdatePageSettings(); SetDlgItemText(IDC_MEMORY_SIZE_TEXT, wGS(ROM_MEM_SIZE).c_str()); + SetDlgItemText(IDC_MEMORY_SIZE_NOTE, wGS(ROM_MEM_SIZE_NOTE).c_str()); SetDlgItemText(IDC_HLE_GFX, wGS(PLUG_HLE_GFX).c_str()); SetDlgItemText(IDC_USE_TLB, wGS(ROM_USE_TLB).c_str()); SetDlgItemText(IDC_VIREFESH_TEXT, wGS(ROM_VIREFRESH).c_str()); diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc index d2720f52d..f26988619 100644 --- a/Source/Project64/UserInterface/UIResources.rc +++ b/Source/Project64/UserInterface/UIResources.rc @@ -228,7 +228,8 @@ BEGIN CONTROL "Delay DP Interrupt",IDC_DELAY_DP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,143,91,10 CONTROL "Delay SI Interrupt",IDC_DELAY_SI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,143,91,10 CONTROL "RSP Audio Signal",IDC_AUDIO_SIGNAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,154,91,10 - CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,154,107,10 + CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,154,107,10 CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,165,91,10 END @@ -1259,21 +1260,22 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN LTEXT "Memory Size:",IDC_MEMORY_SIZE_TEXT,6,8,91,10 COMBOBOX IDC_RDRAM_SIZE,102,6,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,92,91,10 - CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,68,91,10 - LTEXT "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,37,91,10 - EDITTEXT IDC_VIREFRESH,102,35,109,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,51,91,10 - EDITTEXT IDC_COUNTPERBYTE,102,50,109,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Counter Factor:",IDC_COUNTFACT_TEXT,6,21,91,10 - COMBOBOX IDC_COUNTFACT,102,20,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,68,91,10 - CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,80,91,10 - CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,80,91,10 + CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,106,91,10 + CONTROL "Use TLB",IDC_USE_TLB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,82,91,10 + LTEXT "Vi Refresh Rate:",IDC_VIREFESH_TEXT,6,51,91,10 + EDITTEXT IDC_VIREFRESH,102,49,109,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "AI Count Per Byte:",IDC_COUNTPERBYTE_TEXT,6,65,91,10 + EDITTEXT IDC_COUNTPERBYTE,102,64,109,12,ES_AUTOHSCROLL | ES_NUMBER + LTEXT "Counter Factor:",IDC_COUNTFACT_TEXT,6,35,91,10 + COMBOBOX IDC_COUNTFACT,102,34,109,49,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "32 Bit Engine",IDC_ROM_32BIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,82,91,10 + CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,94,91,10 + CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,94,91,10 CONTROL "Randomize SI/PI interrupts",IDC_RANDOMIZE_SIPI_INTERRUPTS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,92,107,10 - CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,104,91,10 - CONTROL "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,104,91,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,106,107,10 + CONTROL "Unaligned DMA",IDC_UNALIGNED_DMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,118,91,10 + CONTROL "Protect Memory",IDC_PROTECT_MEMORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,118,91,10 + RTEXT "Note: 8 MB is forced for Unknown ROMs.",IDC_MEMORY_SIZE_NOTE,6,22,205,8 END IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214 diff --git a/Source/Project64/UserInterface/resource.h b/Source/Project64/UserInterface/resource.h index 16f8d793f..0f67783ce 100644 --- a/Source/Project64/UserInterface/resource.h +++ b/Source/Project64/UserInterface/resource.h @@ -718,6 +718,7 @@ #define IDC_STATUSBAR 1572 #define IDC_CMB_JUMP 1573 #define IDC_COPYTABREGISTERS_BTN 1574 +#define IDC_MEMORY_SIZE_NOTE 1574 #define IDC_F0_LBL 1575 #define IDC_F1_LBL 1576 #define IDC_F2_LBL 1577 @@ -939,7 +940,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 219 #define _APS_NEXT_COMMAND_VALUE 40121 -#define _APS_NEXT_CONTROL_VALUE 1574 +#define _APS_NEXT_CONTROL_VALUE 1575 #define _APS_NEXT_SYMED_VALUE 102 #endif #endif