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

-Fixed typo in variable name (SupressGeenzonging) 

-Removed state capture from TasMovie.RecordFrame
-Fixed: States weren't captured while left mouse button was still down from clicking a frame.
-TAStudio now automatically captures after loading a new movie.
This commit is contained in:
Suuper 2015-07-13 22:05:50 -05:00
parent 510ebf519a
commit e3a8c33be5
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
View File

@ -23,11 +23,6 @@ namespace BizHawk.Client.Common
LagLog.RemoveFrom(frame);
LagLog[frame] = Global.Emulator.AsInputPollable().IsLagFrame;
if (!SupressGreenzonging)
{
StateManager.Capture();
}
if (frame != 0)
ChangeLog.SetGeneralRedo();
}

4
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -240,11 +240,11 @@ namespace BizHawk.Client.Common
return base.GetInputState(frame);
}
public bool SupressGreenzonging { get; set; }
public bool SupressGreenzoneing { get; set; }
public void GreenzoneCurrentFrame()
{
if (!SupressGreenzonging)
if (!SupressGreenzoneing)
{
LagLog[Global.Emulator.Frame] = Global.Emulator.AsInputPollable().IsLagFrame;

5
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -310,7 +310,6 @@ namespace BizHawk.Client.EmuHawk
if (e.Button == MouseButtons.Left)
{
CurrentTasMovie.SupressGreenzonging = true; // This is necessary because we will invalidate, but we won't navigate until mouse up, during that time the user may have emulated frames and we don't want to caputre states for those
_leftButtonHeld = true;
// SuuperW: Exit float editing mode, or re-enter mouse editing
if (_floatEditRow != -1)
@ -342,6 +341,8 @@ namespace BizHawk.Client.EmuHawk
}
else // User changed input
{
CurrentTasMovie.SupressGreenzoneing = true; // This is necessary because we will invalidate, but we won't navigate until mouse up, during that time the user may have emulated frames and we don't want to caputre states for those
if (Global.MovieSession.MovieControllerAdapter.Type.BoolButtons.Contains(buttonName))
{
CurrentTasMovie.ChangeLog.BeginNewBatch("Paint Bool");
@ -448,7 +449,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (e.Button == MouseButtons.Left)
{
CurrentTasMovie.SupressGreenzonging = false;
CurrentTasMovie.SupressGreenzoneing = false;
_startCursorDrag = false;
_startFrameDrag = false;
_startBoolDrawColumn = string.Empty;

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

@ -370,6 +370,7 @@ namespace BizHawk.Client.EmuHawk
SetTasMovieCallbacks();
CurrentTasMovie.ClearChanges(); // Don't ask to save changes here.
HandleMovieLoadStuff();
CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
RefreshDialog();
}
@ -545,10 +546,14 @@ namespace BizHawk.Client.EmuHawk
LoadState(closestState);
}
if (GlobalWin.MainForm.EmulatorPaused || GlobalWin.MainForm.IsSeeking || _mouseWheelTimer.Enabled) // make seek frame keep up with emulation on fast scrolls
// frame == Emualtor.Frame when frame == 0
if (frame > Emulator.Frame)
{
GlobalWin.MainForm.PauseOnFrame = frame;
GlobalWin.MainForm.UnpauseEmulator();
if (GlobalWin.MainForm.EmulatorPaused || GlobalWin.MainForm.IsSeeking || _mouseWheelTimer.Enabled) // make seek frame keep up with emulation on fast scrolls
{
GlobalWin.MainForm.PauseOnFrame = frame;
GlobalWin.MainForm.UnpauseEmulator();
}
}
}