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

simplify frame advance bool logic 

this now also prevents _runloopFrameProgress from potentially getting stuck after rewinding and fixes some other obscure interactions with frame advance and rewind.

- added 2 bugs
This commit is contained in:
Morilli 2025-03-23 15:20:09 +01:00
parent 98e8901076
commit 69862fef70
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -2991,20 +2991,21 @@ namespace BizHawk.Client.EmuHawk
double frameAdvanceTimestampDeltaMs = (double)(currentTimestamp - _frameAdvanceTimestamp) / Stopwatch.Frequency * 1000.0;
bool frameProgressTimeElapsed = frameAdvanceTimestampDeltaMs >= Config.FrameProgressDelayMs;
if (Config.SkipLagFrame && Emulator.CanPollInput() && Emulator.AsInputPollable().IsLagFrame && frameProgressTimeElapsed && Emulator.Frame > 0)
// TODO technically this should only force run frames if the frame advance key has been used
if (Config.SkipLagFrame && Emulator.CanPollInput() && Emulator.AsInputPollable().IsLagFrame && Emulator.Frame > 0)
{
runFrame = true;
}
RA?.Update();
bool oldFrameAdvanceCondition = InputManager.ClientControls["Frame Advance"] || PressFrameAdvance || HoldFrameAdvance;
bool frameAdvance = InputManager.ClientControls["Frame Advance"] || PressFrameAdvance || HoldFrameAdvance;
if (FrameInch)
{
FrameInch = false;
if (EmulatorPaused || oldFrameAdvanceCondition)
if (EmulatorPaused)
{
oldFrameAdvanceCondition = true;
frameAdvance = true;
}
else
{
@ -3012,42 +3013,34 @@ namespace BizHawk.Client.EmuHawk
}
}
bool frameAdvance = oldFrameAdvanceCondition || FrameInch;
if (!frameAdvance && _runloopFrameAdvance && _runloopFrameProgress)
{
// handle release of frame advance
_runloopFrameProgress = false;
PauseEmulator();
}
_runloopFrameAdvance = frameAdvance;
if (frameAdvance)
{
FrameInch = false;
// handle the initial trigger of a frame advance
if (_frameAdvanceTimestamp == 0)
if (!_runloopFrameAdvance)
{
PauseEmulator();
// handle the initial trigger of a frame advance
runFrame = true;
_frameAdvanceTimestamp = currentTimestamp;
PauseEmulator();
}
else
else if (frameProgressTimeElapsed)
{
// handle the timed transition from countdown to FrameProgress
if (frameProgressTimeElapsed)
{
runFrame = true;
_runloopFrameProgress = true;
UnpauseEmulator();
}
runFrame = true;
_runloopFrameProgress = true;
UnpauseEmulator();
}
}
else
{
_frameAdvanceTimestamp = 0;
if (_runloopFrameAdvance)
{
// handle release of frame advance
PauseEmulator();
}
_runloopFrameProgress = false;
}
_runloopFrameAdvance = frameAdvance;
#if BIZHAWKBUILD_SUPERHAWK
if (!EmulatorPaused && (!Config.SuperHawkThrottle || InputManager.ClientControls.AnyInputHeld))
#else