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

Revert "tastudio: instead of capturing a tsm state after loading a branch, force greenzone creation when we're navigating past last greenzone frame" 

This reverts commit ade701f873.
This commit is contained in:
feos 2019-06-18 20:41:32 +03:00
parent b12b061a83
commit 92847b1d1d
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -900,19 +900,8 @@ namespace BizHawk.Client.EmuHawk
_unpauseAfterSeeking = (fromRewinding || WasRecording) && !Mainform.EmulatorPaused;
TastudioPlayMode();
// feos: if there is a state BETWEEN the current frame and the last valid (laglog) frame,
// prefer the latter and use state prior to that. otherwise greenzone will never be appended
// TODO: allow gaps in greenzone to overcome this
// we don't want to wait for seeking to end if there are states in the middle of invalid greenzone
// if there are such states, then we can navigate there, hence it's supposed to be a greenzone
KeyValuePair<int, byte[]> closestState = CurrentTasMovie.TasStateManager
.GetStateClosestToFrame(Math.Min(frame, CurrentTasMovie.LastValidFrame));
if (closestState.Value != null
&& (frame < Emulator.Frame
|| closestState.Key > Emulator.Frame
|| CurrentTasMovie.LastValidFrame < Emulator.Frame))
KeyValuePair<int, byte[]> closestState = CurrentTasMovie.TasStateManager.GetStateClosestToFrame(frame);
if (closestState.Value != null && (frame < Emulator.Frame || closestState.Key > Emulator.Frame))
{
LoadState(closestState);
}