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

Tastudio - fix run away turbo seek, and fix going to the next emulated frame to just emulate a frame rather than loadstate then emulate

This commit is contained in:
adelikat 2014-09-19 21:22:53 +00:00
parent c18410d4af
commit 83ab148708
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,15 +335,23 @@ namespace BizHawk.Client.EmuHawk
// TODO: get the last greenzone frame and go there
_currentTasMovie.SwitchToPlay();
if (_currentTasMovie.LastEmulatedFrame > 0)
var shouldLoadstate = true;
// Some situations it is silly to load a state
if (frame - Global.Emulator.Frame == 1)
{
shouldLoadstate = false;
}
if (_currentTasMovie.LastEmulatedFrame > 0 && shouldLoadstate)
{
Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_currentTasMovie[_currentTasMovie.LastEmulatedFrame].State.ToArray())));
}
GlobalWin.MainForm.UnpauseEmulator();
if (Global.Config.TAStudioAutoPause)
if (Global.Config.TAStudioAutoPause && frame < _currentTasMovie.InputLogLength)
{
GlobalWin.MainForm.PauseOnFrame = _currentTasMovie.LastEmulatedFrame;
GlobalWin.MainForm.PauseOnFrame = _currentTasMovie.InputLogLength;
}
else
{