From a639cfd275fe618e8ae596e973370c243d2b37cd Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 14 Oct 2014 13:24:15 +0000 Subject: [PATCH] remove some code in tasmovie that isn't necessary now --- BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 16 ---------------- .../tools/TAStudio/TAStudio.cs | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index c415306991..e914d5a255 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -316,14 +316,6 @@ namespace BizHawk.Client.Common return StateManager.GetStateClosestToFrame(frame); } - /// - /// Captures the current frame into the greenzone - /// - public void CaptureCurrentState() - { - StateManager.Capture(); - } - public void ClearGreenzone() { if (StateManager.Any()) @@ -333,14 +325,6 @@ namespace BizHawk.Client.Common } } - public bool HasGreenzone // TODO: get rid of wrappers like this now that we expose the state manager directly - { - get - { - return StateManager.Any(); - } - } - public TasStateManager TasStateManager { get diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 3445ce3398..30d1aaaf74 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -648,7 +648,7 @@ namespace BizHawk.Client.EmuHawk _tasClipboard.Any(); ClearGreenzoneMenuItem.Enabled = - _currentTasMovie != null && _currentTasMovie.HasGreenzone; + _currentTasMovie != null && _currentTasMovie.TasStateManager.Any(); GreenzoneICheckSeparator.Visible = GreenZzoneIntegrityCheckMenuItem.Visible = @@ -1105,7 +1105,7 @@ namespace BizHawk.Client.EmuHawk { NewTasMovie(); GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true); - _currentTasMovie.CaptureCurrentState(); + _currentTasMovie.TasStateManager.Capture(); _currentTasMovie.SwitchToRecord(); _currentTasMovie.ClearChanges(); }