From 705af68f652947da0a2fd58cd39e54706470620b Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 25 May 2020 16:50:56 -0500 Subject: [PATCH] check if ITasMovie not TasMovie, still not great that it needs to check types but better --- src/BizHawk.Client.Common/SaveSlotManager.cs | 6 +++--- src/BizHawk.Client.Common/SavestateManager.cs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/BizHawk.Client.Common/SaveSlotManager.cs b/src/BizHawk.Client.Common/SaveSlotManager.cs index 2edf5ce5a9..308cc03e2d 100644 --- a/src/BizHawk.Client.Common/SaveSlotManager.cs +++ b/src/BizHawk.Client.Common/SaveSlotManager.cs @@ -24,7 +24,7 @@ namespace BizHawk.Client.Common for (int i = 0; i < 10; i++) { - if (movie is TasMovie tasMovie) + if (movie is ITasMovie tasMovie) { _slots[i] = i < tasMovie.Branches.Count; } @@ -67,10 +67,10 @@ namespace BizHawk.Client.Common public void ToggleRedo(IMovie movie, int slot) { - if (0.RangeTo(9).Contains(slot) && !(movie is TasMovie)) _redo[slot] ^= true; + if (0.RangeTo(9).Contains(slot) && !(movie is ITasMovie)) _redo[slot] ^= true; } - public bool IsRedo(IMovie movie, int slot) => 0.RangeTo(9).Contains(slot) && !(movie is TasMovie) && _redo[slot]; + public bool IsRedo(IMovie movie, int slot) => 0.RangeTo(9).Contains(slot) && !(movie is ITasMovie) && _redo[slot]; public void SwapBackupSavestate(IMovie movie, string path, int currentSlot) { diff --git a/src/BizHawk.Client.Common/SavestateManager.cs b/src/BizHawk.Client.Common/SavestateManager.cs index aaff4ab7fc..11926bc50a 100644 --- a/src/BizHawk.Client.Common/SavestateManager.cs +++ b/src/BizHawk.Client.Common/SavestateManager.cs @@ -85,12 +85,12 @@ namespace BizHawk.Client.Common }); } - if (Global.MovieSession.Movie.IsActive() && Global.MovieSession.Movie is TasMovie) + if (Global.MovieSession.Movie.IsActive() && Global.MovieSession.Movie is ITasMovie) { bs.PutLump(BinaryStateLump.LagLog, delegate(TextWriter tw) { - ((TasMovie)Global.MovieSession.Movie).LagLog.Save(tw); + ((ITasMovie)Global.MovieSession.Movie).LagLog.Save(tw); }); } } @@ -152,11 +152,11 @@ namespace BizHawk.Client.Common Global.UserBag = (Dictionary)ConfigService.LoadWithType(userData); } - if (Global.MovieSession.Movie.IsActive() && Global.MovieSession.Movie is TasMovie) + if (Global.MovieSession.Movie.IsActive() && Global.MovieSession.Movie is ITasMovie) { bl.GetLump(BinaryStateLump.LagLog, false, delegate(TextReader tr) { - ((TasMovie)Global.MovieSession.Movie).LagLog.Load(tr); + ((ITasMovie)Global.MovieSession.Movie).LagLog.Load(tr); }); } }