ok rewind really was broken
This commit is contained in:
parent
c7553397d7
commit
6ac8c1544a
|
@ -570,6 +570,7 @@ namespace BizHawk.MultiClient
|
||||||
bool runFrame = false;
|
bool runFrame = false;
|
||||||
runloop_frameadvance = false;
|
runloop_frameadvance = false;
|
||||||
DateTime now = DateTime.Now;
|
DateTime now = DateTime.Now;
|
||||||
|
bool suppressCaptureRewind = false;
|
||||||
|
|
||||||
double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds;
|
double frameAdvanceTimestampDelta = (now - FrameAdvanceTimestamp).TotalMilliseconds;
|
||||||
bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta;
|
bool frameProgressTimeElapsed = Global.Config.FrameProgressDelayMs < frameAdvanceTimestampDelta;
|
||||||
|
@ -615,13 +616,14 @@ namespace BizHawk.MultiClient
|
||||||
if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
|
if (/*Global.Config.RewindEnabled && */Global.ClientControls["Rewind"])
|
||||||
{
|
{
|
||||||
Rewind(Global.ClientControls["Fast Forward"] ? 4 : 2);
|
Rewind(Global.ClientControls["Fast Forward"] ? 4 : 2);
|
||||||
|
suppressCaptureRewind = true;
|
||||||
runFrame = true;
|
runFrame = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool genSound = false;
|
bool genSound = false;
|
||||||
if (runFrame)
|
if (runFrame)
|
||||||
{
|
{
|
||||||
CaptureRewindState();
|
if(!suppressCaptureRewind) CaptureRewindState();
|
||||||
if (!runloop_frameadvance) genSound = true;
|
if (!runloop_frameadvance) genSound = true;
|
||||||
else if (!Global.Config.MuteFrameAdvance)
|
else if (!Global.Config.MuteFrameAdvance)
|
||||||
genSound = true;
|
genSound = true;
|
||||||
|
|
Loading…
Reference in New Issue