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

Deal with this TODO. Removing from the StateCache here was removing extra frames. (frames between the old last gap frame and new last gap frame which were in another buffer)

This commit is contained in:
SuuperW 2020-12-20 18:04:02 -06:00
parent 55c08dc77f
commit 01bcf22802
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManager.cs
View File

@ -372,9 +372,15 @@ namespace BizHawk.Client.Common
// The user navigates to a frame after ancient interval 2, replay happens and we start filling gaps
// Then the user, still without having made an edit, navigates to a frame before ancient interval 2, but after ancient interval 1
// Without this logic, we end up with out of order states
if (_gapFiller.Count > 0 && frame < GapStates().First().Frame)
// We cannot use InvalidateGaps because that does not address the state cache.
for (int i = _gapFiller.Count - 1; i >= 0; i--)
{
InvalidateGaps(frame);
int lastGap = _gapFiller.GetState(i).Frame;
if (lastGap < frame)
break;
StateCache.Remove(lastGap);
_gapFiller.InvalidateEnd(i);
}
_gapFiller.Capture(
@ -419,9 +425,6 @@ namespace BizHawk.Client.Common
var state = _gapFiller.GetState(i);
if (state.Frame > frame)
{
var last = GapStates().First();
StateCache.RemoveAll(s => s >= state.Frame && s <= last.Frame); // TODO: be consistent, other invalidate methods do not touch cache and it is addressed in the public InvalidateAfter
_gapFiller.InvalidateEnd(i);
return true;
}