ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Overclock modifier to Defaults panel

This commit is contained in:
zilmar 2024-12-05 17:30:59 +10:30
parent 77cd679756
commit c6b41da926
8 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-core/N64System/Enhancement/Enhancement.cpp
View File

@ -363,9 +363,9 @@ void CEnhancement::SetOverClock(bool OverClock, uint32_t OverClockModifier)
{
m_OverClockModifier = 1;
}
if (m_OverClockModifier > 20)
if (m_OverClockModifier > 100)
{
m_OverClockModifier = 20;
m_OverClockModifier = 100;
}
}

4
Source/Project64-core/Settings.cpp
View File

@ -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));

8
Source/Project64-core/Settings/GameSettings.cpp
View File

@ -99,9 +99,9 @@ void CGameSettings::RefreshGameSettings()
{
m_OverClockModifier = 1;
}
if (m_OverClockModifier > 20)
if (m_OverClockModifier > 100)
{
m_OverClockModifier = 20;
m_OverClockModifier = 100;
}
m_DiskSeekTimingType = (DISK_SEEK_TYPE)g_Settings->LoadDword(Game_DiskSeekTiming);
m_UnalignedDMA = g_Settings->LoadBool(Game_UnalignedDMA);
@ -137,9 +137,9 @@ void CGameSettings::SetOverClockModifier(bool EnhancmentOverClock, uint32_t Enha
{
m_OverClockModifier = 1;
}
if (m_OverClockModifier > 20)
if (m_OverClockModifier > 100)
{
m_OverClockModifier = 20;
m_OverClockModifier = 100;
}
}

2
Source/Project64-core/Settings/SettingsID.h
View File

@ -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,

3
Source/Project64/UserInterface/Settings/SettingsPage-Defaults.cpp
View File

@ -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_TEXT, 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_TEXT));
AddModCheckBox(GetDlgItem(IDC_HLE_GFX), Default_UseHleGfx);
AddModCheckBox(GetDlgItem(IDC_SYNC_AUDIO), Default_SyncViaAudio);

1
Source/Project64/UserInterface/Settings/SettingsPage-Defaults.h
View File

@ -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()

41
Source/Project64/UserInterface/UIResources.rc
View File

@ -1,7 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#include "../../Project64-core/Version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@ -1240,13 +1239,15 @@ BEGIN
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
LTEXT "Disk Seek Timing:",IDC_OVER_CLOCK_MODIFIER_TEXT,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 "Overclock modifier:",IDC_OVER_CLOCK_MODIFIER_TEXT,6,97,91,10
EDITTEXT IDC_OVER_CLOCK_MODIFIER,102,95,109,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Fixed Audio Timing",IDC_ROM_FIXEDAUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,110,91,10
CONTROL "Sync using Audio",IDC_SYNC_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,110,107,10
CONTROL "Use High Level GFX",IDC_HLE_GFX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,122,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,122,107,10
END
IDD_Enhancement_Config DIALOGEX 0, 0, 206, 214
@ -2102,25 +2103,29 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILE_VERSION
PRODUCTVERSION VER_PRODUCT_VERSION
FILEVERSION 4,0,0,6507
PRODUCTVERSION 4,0,0,6507
FILEFLAGSMASK 0x3fL
FILEFLAGS VER_FILEFLAGS
FILEOS VER_FILEOS
FILETYPE VER_FILETYPE
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", VER_FILE_DESCRIPTION_STR "\0"
VALUE "FileVersion", VER_FILE_VERSION_STR "\0"
VALUE "InternalName", VER_INTERNAL_NAME_STR "\0"
VALUE "LegalCopyright", VER_COPYRIGHT_STR "\0"
VALUE "OriginalFilename", VER_ORIGINAL_FILENAME_STR "\0"
VALUE "ProductName", VER_PRODUCTNAME_STR
VALUE "ProductVersion", VER_PRODUCT_VERSION_STR "\0"
VALUE "FileDescription", "Project64"
VALUE "FileVersion", "Dev-4.0.0.6507-77cd6797-Dirty"
VALUE "InternalName", "Project64"
VALUE "LegalCopyright", "Copyright (C) 2024"
VALUE "OriginalFilename", "Project64.exe"
VALUE "ProductName", "Project64"
VALUE "ProductVersion", "Dev-4.0.0.6507-77cd6797-Dirty"
END
END
BLOCK "VarFileInfo"

4
Source/Project64/UserInterface/resource.h
View File

@ -255,19 +255,19 @@
#define IDC_DIR_FRAME1 1101
#define IDC_ROM_FASTSP 1101
#define IDC_INFO 1101
#define IDC_OVER_CLOCK_MODIFIER_TEXT 1101
#define IDC_DISKSEEKTIMING_TEXT1 1101
#define IDC_AUDIO_SIGNAL 1102
#define IDC_DIR_TEXTURE_FRAME 1102
#define IDC_ENTER_CODE 1102
#define IDC_DESCRIPTION 1102
#define IDC_DIR_FRAME3 1103
#define IDC_OVER_CLOCK_MODIFIER 1103
#define IDC_REQUEST_DESCPTION 1103
#define IDC_DIR_FRAME4 1104
#define IDC_REQUEST_LINK 1104
#define IDC_DIR_FRAME5 1105
#define IDC_MACHINE_ID 1105
#define IDC_OVER_CLOCK_MODIFIER_TEXT 1106
#define IDC_OVER_CLOCK_MODIFIER 1107
#define IDC_MAXROMS_TXT 1111
#define IDC_ROMSEL_TEXT2 1112
#define IDC_R0_EDIT 1112