From 52544efec90c3685ba992e09de4a7384602b8f2e Mon Sep 17 00:00:00 2001 From: Suuper Date: Wed, 22 Jul 2015 14:31:47 -0500 Subject: [PATCH] -Branches now have their own undo history --- BizHawk.Client.Common/movie/tasproj/TasBranch.cs | 1 + BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 1 + .../tools/TAStudio/BookmarksBranchesBox.cs | 9 +++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs index cb0917fef7..6583006bb1 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasBranch.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasBranch.cs @@ -14,6 +14,7 @@ namespace BizHawk.Client.Common public List InputLog { get; set; } public BitmapBuffer OSDFrameBuffer { get; set; } public TasLagLog LagLog { get; set; } + public TasMovieChangeLog ChangeLog { get; set; } } public class TasBranchCollection : List diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 67aa0907e3..dabaefa9f2 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -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; } } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 5fc46b49dd..0276ea8ddd 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -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];