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

OOPS! Undo my change with moving UpdateToolsBefore()

This commit is contained in:
adelikat 2012-10-11 22:37:44 +00:00
parent 932952ae61
commit 2dacb356c2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BizHawk.MultiClient/MainForm.cs
View File

@ -2153,11 +2153,6 @@ namespace BizHawk.MultiClient
void StepRunLoop_Core() void StepRunLoop_Core()
{ {
bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["MaxTurbo"];
bool fff = Global.ClientControls["MaxTurbo"];
bool updateFpsString = (runloop_last_ff != ff);
runloop_last_ff = ff;
bool runFrame = false; bool runFrame = false;
runloop_frameadvance = false; runloop_frameadvance = false;
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
@ -2166,11 +2161,6 @@ namespace BizHawk.MultiClient
double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds; double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds;
bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta; bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta;
if (!fff)
{
UpdateToolsBefore();
}
if (Global.Config.SkipLagFrame && Global.Emulator.IsLagFrame && frameProgressTimeElapsed) if (Global.Config.SkipLagFrame && Global.Emulator.IsLagFrame && frameProgressTimeElapsed)
{ {
Global.Emulator.FrameAdvance(true); Global.Emulator.FrameAdvance(true);
@ -2245,6 +2235,16 @@ namespace BizHawk.MultiClient
bool coreskipaudio = false; bool coreskipaudio = false;
if (runFrame) if (runFrame)
{ {
bool ff = Global.ClientControls["Fast Forward"] || Global.ClientControls["MaxTurbo"];
bool fff = Global.ClientControls["MaxTurbo"];
bool updateFpsString = (runloop_last_ff != ff);
runloop_last_ff = ff;
if (!fff)
{
UpdateToolsBefore();
}
runloop_fps++; runloop_fps++;
//client input-related duties //client input-related duties
Global.OSD.ClearGUIText(); Global.OSD.ClearGUIText();