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

-Branches now have their own undo history

This commit is contained in:
Suuper 2015-07-22 14:31:47 -05:00
parent 6f105f6ee8
commit 52544efec9
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/movie/tasproj/TasBranch.cs
View File

@ -14,6 +14,7 @@ namespace BizHawk.Client.Common
public List<string> InputLog { get; set; }
public BitmapBuffer OSDFrameBuffer { get; set; }
public TasLagLog LagLog { get; set; }
public TasMovieChangeLog ChangeLog { get; set; }
}
public class TasBranchCollection : List<TasBranch>

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

@ -465,6 +465,7 @@ namespace BizHawk.Client.Common
StateManager.SetState(branch.Frame, branch.CoreData);
//LagLog.Clear(); LagLog and InputLog is the same reference as what's in the branch!
LagLog.FromLagLog(branch.LagLog);
ChangeLog = branch.ChangeLog;
}
}
}

9
BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -86,7 +86,8 @@ namespace BizHawk.Client.EmuHawk
InputLog = Tastudio.CurrentTasMovie.InputLog.ToList(),
OSDFrameBuffer = GlobalWin.MainForm.CaptureOSD(),
//OSDFrameBuffer = (int[])(Global.Emulator.VideoProvider().GetVideoBuffer().Clone()),
LagLog = Tastudio.CurrentTasMovie.TasLagLog.Clone()
LagLog = Tastudio.CurrentTasMovie.TasLagLog.Clone(),
ChangeLog = new TasMovieChangeLog(Tastudio.CurrentTasMovie)
};
Branches.Add(branch);
@ -169,9 +170,9 @@ namespace BizHawk.Client.EmuHawk
private double Fps()
{
var movie = Tastudio.CurrentTasMovie;
var system = movie.HeaderEntries[HeaderKeys.PLATFORM];
var pal = movie.HeaderEntries.ContainsKey(HeaderKeys.PAL) &&
TasMovie movie = Tastudio.CurrentTasMovie;
string system = movie.HeaderEntries[HeaderKeys.PLATFORM];
bool pal = movie.HeaderEntries.ContainsKey(HeaderKeys.PAL) &&
movie.HeaderEntries[HeaderKeys.PAL] == "1";
return FrameRates[system, pal];