diff --git a/pcsx2/Counters.cpp b/pcsx2/Counters.cpp index 759b218a7a..3524e0ba89 100644 --- a/pcsx2/Counters.cpp +++ b/pcsx2/Counters.cpp @@ -284,10 +284,11 @@ void frameLimitReset() // Framelimiter - Measures the delta time between calls and stalls until a // certain amount of time passes if such time hasn't passed yet. // See the GS FrameSkip function for details on why this is here and not in the GS. +extern int limitOn; static __forceinline void frameLimit() { // 999 means the user would rather just have framelimiting turned off... - if( !EmuConfig.Video.EnableFrameLimiting || EmuConfig.Video.FpsLimit >= 999 ) return; + if( /*!EmuConfig.Video.EnableFrameLimiting*/ !limitOn || EmuConfig.Video.FpsLimit >= 999 ) return; s64 sDeltaTime; u64 uExpectedEnd; diff --git a/pcsx2/gui/GlobalCommands.cpp b/pcsx2/gui/GlobalCommands.cpp index d55b5160eb..54ba646c47 100644 --- a/pcsx2/gui/GlobalCommands.cpp +++ b/pcsx2/gui/GlobalCommands.cpp @@ -53,16 +53,20 @@ wxString KeyAcceleratorCode::ToString() const ).ToString(); } - +int limitOn = false; namespace Implementations { void Frameskip_Toggle() { + limitOn ^= 1; + Console.WriteLn("Framelimit mode changed to %d", limitOn ? 1 : 0); // FIXME : Reimplement framelimiting using new double-switch boolean system } void Framelimiter_TurboToggle() { + limitOn ^= 1; + Console.WriteLn("Framelimit mode changed to %d", limitOn ? 1 : 0); } void Framelimiter_MasterToggle()