diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 9b26f14e53..ee482e958f 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -41,7 +41,6 @@ namespace BizHawk.Client.Common public TasMovieRecord this[int index] => new TasMovieRecord { - // State = StateManager[index], HasState = _stateManager.HasState(index), LogEntry = GetInputLogEntry(index), Lagged = _lagLog[index + 1], @@ -246,14 +245,6 @@ namespace BizHawk.Client.Common _lagLog.Clear(); } - public void DeleteLogBefore(int frame) - { - if (frame < Log.Count) - { - Log.RemoveRange(0, frame); - } - } - public void CopyLog(IEnumerable log) { Log.Clear(); @@ -276,7 +267,7 @@ namespace BizHawk.Client.Common return Log; } - private int? _timelineBranchFrame = null; + private int? _timelineBranchFrame; // TODO: this is 99% copy pasting of bad code public override bool ExtractInputLog(TextReader reader, out string errorMessage) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index c7a25d82c0..e7afee0d36 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -739,7 +739,7 @@ namespace BizHawk.Client.EmuHawk return; } - MovieZone loadZone = new MovieZone(path) + var loadZone = new MovieZone(path) { Start = TasView.FirstSelectedIndex.Value }; @@ -864,7 +864,6 @@ namespace BizHawk.Client.EmuHawk TasView.Refresh(); - //SetSplicer(); CurrentTasMovie.FlushInputCache(); CurrentTasMovie.UseInputCache = false; @@ -895,11 +894,13 @@ namespace BizHawk.Client.EmuHawk private void StartAtNearestFrameAndEmulate(int frame, bool fromLua, bool fromRewinding) { if (frame == Emulator.Frame) + { return; + } _unpauseAfterSeeking = (fromRewinding || WasRecording) && !Mainform.EmulatorPaused; TastudioPlayMode(); - KeyValuePair closestState = CurrentTasMovie.TasStateManager.GetStateClosestToFrame(frame); + var closestState = CurrentTasMovie.TasStateManager.GetStateClosestToFrame(frame); if (closestState.Value.Length > 0 && (frame < Emulator.Frame || closestState.Key > Emulator.Frame)) { LoadState(closestState); diff --git a/BizHawk.sln.DotSettings b/BizHawk.sln.DotSettings index 2f5c4a46d9..f62ceeecdc 100644 --- a/BizHawk.sln.DotSettings +++ b/BizHawk.sln.DotSettings @@ -174,6 +174,7 @@ True True True + True True True True