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

Revert "tastudio: move LastPositionFrame to TasMovie, prepare for another revision" 

This reverts commit eea49f1895.
This commit is contained in:
feos 2016-11-21 20:03:56 +03:00
parent eea49f1895
commit ef8068daa4
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,6 @@ namespace BizHawk.Client.Common
BindMarkersToInput = true; BindMarkersToInput = true;
CurrentBranch = -1; CurrentBranch = -1;
LastPositionFrame = -1;
} }
public TasMovie(bool startsFromSavestate = false, BackgroundWorker progressReportWorker = null) public TasMovie(bool startsFromSavestate = false, BackgroundWorker progressReportWorker = null)
@ -79,7 +78,6 @@ namespace BizHawk.Client.Common
BindMarkersToInput = true; BindMarkersToInput = true;
CurrentBranch = -1; CurrentBranch = -1;
LastPositionFrame = -1;
} }
public TasLagLog TasLagLog { get { return LagLog; } } public TasLagLog TasLagLog { get { return LagLog; } }
@ -87,23 +85,11 @@ namespace BizHawk.Client.Common
public TasMovieMarkerList Markers { get; set; } public TasMovieMarkerList Markers { get; set; }
public bool BindMarkersToInput { get; set; } public bool BindMarkersToInput { get; set; }
public bool UseInputCache { get; set; } public bool UseInputCache { get; set; }
public bool LastPositionStable = true;
public string NewBranchText = ""; public string NewBranchText = "";
public int CurrentBranch { get; set; } public int CurrentBranch { get; set; }
public int BranchCount { get { return Branches.Count; } } public int BranchCount { get { return Branches.Count; } }
/// <summary>
/// Separates "restore last position" logic from seeking caused by navigation.
/// TASEditor never kills LastPositionFrame, and it only pauses on it,
/// if it hasn't been greenzoned beforehand and middle mouse button was pressed.
/// </summary>
public int LastPositionFrame { get; set; }
/// <summary>
/// If user emulated a new frame, current edited segment may change
/// TASEditor lets LastPositionFrame be changed then
/// </summary>
public bool LastPositionStable = true;
public TasBranch GetBranch(int index) public TasBranch GetBranch(int index)
{ {
if (index >= Branches.Count || index < 0) if (index >= Branches.Count || index < 0)
@ -327,6 +313,7 @@ namespace BizHawk.Client.Common
{ {
if (Global.Emulator.Frame > LastValidFrame) if (Global.Emulator.Frame > LastValidFrame)
{ {
// emulated a new frame, current editing segment may change now. taseditor logic
LastPositionStable = false; LastPositionStable = false;
} }

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

@ -115,17 +115,12 @@ namespace BizHawk.Client.EmuHawk
get { return GlobalWin.MainForm; } get { return GlobalWin.MainForm; }
} }
public int LastPositionFrame /// <summary>
{ /// Separates "restore last position" logic from seeking caused by navigation.
get /// TASEditor never kills LastPositionFrame, and it only pauses on it,
{ /// if it hasn't been greenzoned beforehand and middle mouse button was pressed.
return CurrentTasMovie.LastPositionFrame; /// </summary>
} public int LastPositionFrame { get; set; }
set
{
CurrentTasMovie.LastPositionFrame = value;
}
}
#region "Initializing" #region "Initializing"
@ -174,6 +169,7 @@ namespace BizHawk.Client.EmuHawk
TasView.PointedCellChanged += TasView_PointedCellChanged; TasView.PointedCellChanged += TasView_PointedCellChanged;
TasView.MultiSelect = true; TasView.MultiSelect = true;
TasView.MaxCharactersInHorizontal = 1; TasView.MaxCharactersInHorizontal = 1;
LastPositionFrame = -1;
} }
private void AutosaveTimerEventProcessor(object sender, EventArgs e) private void AutosaveTimerEventProcessor(object sender, EventArgs e)