From 44d76036224549c37b761775cc59be05d4f79201 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 23 Aug 2020 20:40:36 -0500 Subject: [PATCH] only apply gap filling at the start of the start of an interval. This addresses the "odd" behavior that if you have a gap of 10 in current, and navigate from frame 100 to 99, you get a state saved at 91 --- .../movie/tasproj/ZwinderStateManager.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs b/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs index 6465d9950a..f7eabb8c89 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs @@ -219,7 +219,11 @@ namespace BizHawk.Client.Common // reserved states can include future states in the case of branch states if (frame <= LastRing) { - CaptureGap(frame, source); + if (NeedsGap(frame)) + { + CaptureGap(frame, source); + } + return; } @@ -288,6 +292,14 @@ namespace BizHawk.Client.Common return false; } + private bool NeedsGap(int frame) + { + // When starting to fill gaps we won't actually know the true frequency, so fall back to current + // Current may very well not be the same as gap, but it's a reasonable behavior to have a current sized gap before seeing filler sized gaps + var frequency = _gapFiller.Count == 0 ? _current.RewindFrequency : _gapFiller.RewindFrequency; + return !StateCache.Any(sc => sc < frame && sc > frame - frequency); + } + private void CaptureGap(int frame, IStatable source) { _gapFiller.Capture(