From 01909dfb9871998acfaadf8ba6b98fae1ec2674a Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 1 Nov 2014 14:01:21 +0000 Subject: [PATCH] Tastudio - When creating a savestate-anchored movie from an existing movie, copy the previous input into VerificationLog.txt --- .../movie/conversions/MovieConversionExtensions.cs | 8 +++++--- BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 11 ++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs index 96487ec206..31fe971ac9 100644 --- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs +++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs @@ -141,9 +141,11 @@ namespace BizHawk.Client.Common.MovieConversionExtensions tas.TasStateManager.Clear(); tas.ClearLagLog(); - tas.CopyLog(old.GetLogEntries()); - tas.DeleteLogBefore(frame); - + var entries = old.GetLogEntries(); + + tas.CopyLog(entries.Skip(frame)); + tas.CopyVerificationLog(entries.Take(frame)); + tas.HeaderEntries.Clear(); foreach (var kvp in old.HeaderEntries) { diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index c14fb80d43..eccd1712be 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -321,7 +321,7 @@ namespace BizHawk.Client.Common } } - public void CopyLog(List log) + public void CopyLog(IEnumerable log) { _log.Clear(); foreach(var entry in log) @@ -330,6 +330,15 @@ namespace BizHawk.Client.Common } } + public void CopyVerificationLog(IEnumerable log) + { + VerificationLog.Clear(); + foreach (var entry in log) + { + VerificationLog.Add(entry); + } + } + public List GetLogEntries() { return _log;