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

Cause the gui to remember if 'Enable Patches' is checked. (Still not used, though.) 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2121 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-03 13:31:45 +00:00
parent 4fc93dded4
commit 35aac70cd1
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Counters.cpp
View File

@ -325,7 +325,7 @@ static __forceinline void frameLimit()
// Shortcut for cases where no waiting is needed (they're running slow already,
// so don't bog 'em down with extra math...)
if( sDeltaTime >= 0 ) return;
// If we're way ahead then we can afford to sleep the thread a bit.
// (note, sleep(1) thru sleep(2) tend to be the least accurate sleeps, and longer
// sleeps tend to be pretty reliable, so that's why the convoluted if/else below)
@ -357,7 +357,7 @@ static __forceinline void VSyncStart(u32 sCycle)
psxVBlankStart();
if (gates) rcntStartGate(true, sCycle); // Counters Start Gate code
//if (Config.Patch) applypatch(1); // fixme - Apply patches
//if (EmuConfig.EnablePatches) applypatch(1); // fixme - Apply patches
// INTC - VB Blank Start Hack --
// Hack fix! This corrects a freezeup in Granda 2 where it decides to spin

2
pcsx2/gui/MainFrame.cpp
View File

@ -158,6 +158,7 @@ void MainEmuFrame::ConnectMenus()
ConnectMenu( MenuId_Boot_ELF, Menu_OpenELF_Click );
ConnectMenu( MenuId_IsoBrowse, Menu_IsoBrowse_Click );
ConnectMenu( MenuId_SkipBiosToggle, Menu_SkipBiosToggle_Click );
ConnectMenu( MenuId_EnablePatches, Menu_EnablePatches_Click );
ConnectMenu( MenuId_Exit, Menu_Exit_Click );
ConnectMenu( MenuId_Sys_SuspendResume, Menu_SuspendResume_Click );
@ -509,6 +510,7 @@ void MainEmuFrame::ApplySettings()
wxMenuBar& menubar( *GetMenuBar() );
menubar.Check( MenuId_SkipBiosToggle, g_Conf->EmuOptions.SkipBiosSplash );
menubar.Check( MenuId_EnablePatches, g_Conf->EmuOptions.EnablePatches );
menubar.Check( MenuId_Config_Multitap0Toggle, g_Conf->EmuOptions.MultitapPort0_Enabled );
menubar.Check( MenuId_Config_Multitap1Toggle, g_Conf->EmuOptions.MultitapPort1_Enabled );

7
pcsx2/gui/MainFrame.h
View File

@ -78,9 +78,9 @@ public:
PerPluginMenuInfo() : MyMenu( *new wxMenu() )
{
}
virtual ~PerPluginMenuInfo() throw();
void Populate( PluginsEnum_t pid );
void OnUnloaded();
void OnLoaded();
@ -112,7 +112,7 @@ protected:
wxMenu& m_SaveStatesSubmenu;
wxMenuItem& m_MenuItem_Console;
PerPluginMenuInfo m_PluginMenuPacks[PluginId_Count];
CmdEvt_ListenerBinding m_Listener_CoreThreadStatus;
@ -157,6 +157,7 @@ protected:
void Menu_IsoBrowse_Click(wxCommandEvent &event);
void Menu_IsoRecent_Click(wxCommandEvent &event);
void Menu_SkipBiosToggle_Click(wxCommandEvent &event);
void Menu_EnablePatches_Click(wxCommandEvent &event);
void Menu_BootCdvd_Click(wxCommandEvent &event);
void Menu_OpenELF_Click(wxCommandEvent &event);

12
pcsx2/gui/MainMenuClicks.cpp
View File

@ -121,6 +121,7 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
}
g_Conf->EmuOptions.SkipBiosSplash = GetMenuBar()->IsChecked( MenuId_SkipBiosToggle );
g_Conf->EmuOptions.EnablePatches = GetMenuBar()->IsChecked( MenuId_EnablePatches );
AppSaveSettings();
sApp.SysExecute( g_Conf->CdvdSource );
@ -171,6 +172,17 @@ void MainEmuFrame::Menu_SkipBiosToggle_Click( wxCommandEvent &event )
}
}
void MainEmuFrame::Menu_EnablePatches_Click( wxCommandEvent &event )
{
g_Conf->EmuOptions.EnablePatches = GetMenuBar()->IsChecked( MenuId_EnablePatches );
if( wxConfigBase* conf = GetAppConfig() )
{
IniSaver saver( *conf );
g_Conf->EmuOptions.LoadSave( saver );
}
}
void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent &event)
{
CoreThread.Suspend();