From c44e5752f6efafcd7eb2762b5b713fa7a9b4208a Mon Sep 17 00:00:00 2001 From: "avihal@gmail.com" Date: Wed, 23 Mar 2011 20:01:56 +0000 Subject: [PATCH] 1. presets: mVU flag hack moved from preset #3 to preset #2 (preset #3 now only changes ee cycle rate to 1 click). 2. Selecting ISO from the list when current source is plugin: menu now updates properly (previously: would stay at plugin). git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4477 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/AppConfig.cpp | 6 +++--- pcsx2/gui/MainMenuClicks.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index 17480d5cef..0896c82064 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -862,17 +862,17 @@ bool AppConfig::IsOkApplyPreset(int n) EmuOptions.Cpu.Recompiler.vuSignOverflow = false; //VU Clamp mode to 'none' //best balanced hacks combo? - case 2 : //enable mvu flag hack, enable EE timing hack, set EE cyclerate to 1 click. + case 2 : //set EE cyclerate to 1 click. eeUsed?0:(eeUsed=true, EmuOptions.Speedhacks.EECycleRate = 1); // EE timing hack appears to break the BIOS text and cause slowdowns in a few titles. //EnableGameFixes = true; //EmuOptions.Gamefixes.EETimingHack = true; - EmuOptions.Speedhacks.vuFlagHack = true; - case 1 : //Recommended speed hacks without mvu flag hack. + case 1 : //Recommended speed hacks. EnableSpeedHacks = true; EmuOptions.Speedhacks.IntcStat = true; EmuOptions.Speedhacks.WaitLoop = true; + EmuOptions.Speedhacks.vuFlagHack = true; case 0 : //Base preset: Mostly pcsx2's defaults. diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index c2109020a6..439e7c2b83 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -153,6 +153,7 @@ wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, co } } + g_Conf->CdvdSource = CDVDsrc_Iso; SysUpdateIsoSrcFile( isoFilename ); if( result == wxID_RESET ) { @@ -162,7 +163,7 @@ wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, co else { Console.Indent().WriteLn( "HotSwapping to new ISO src image!" ); - g_Conf->CdvdSource = CDVDsrc_Iso; + //g_Conf->CdvdSource = CDVDsrc_Iso; //CoreThread.ChangeCdvdSource(); core_control.AllowResume(); }