From 4c9ebf6ed42c882c3eb0e698cc83d588a5325dfc Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 2 Feb 2020 11:39:54 -0600
Subject: [PATCH] MovieSession - rename hacky step 1 and 2 to meaningful names

---
 BizHawk.Client.Common/SavestateManager.cs               | 4 ++--
 BizHawk.Client.Common/movie/MovieSession.cs             | 5 ++---
 BizHawk.Client.Common/movie/interfaces/IMovieSession.cs | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
index ef4cb2483b..d0ca1c28ce 100644
--- a/BizHawk.Client.Common/SavestateManager.cs
+++ b/BizHawk.Client.Common/SavestateManager.cs
@@ -141,13 +141,13 @@ namespace BizHawk.Client.Common
 
 					if (Global.MovieSession.Movie.IsActive())
 					{
-						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState_HackyStep1(tr));
+						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.CheckSavestateTimeline(tr));
 						if (!succeed)
 						{
 							return false;
 						}
 
-						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState_HackyStep2(tr));
+						bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
 						if (!succeed)
 						{
 							return false;
diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 7edd229879..47f63f09b7 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -315,8 +315,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		// TODO: maybe someone who understands more about what's going on here could rename these step1 and step2 into something more descriptive
-		public bool HandleMovieLoadState_HackyStep1(TextReader reader)
+		public bool CheckSavestateTimeline(TextReader reader)
 		{
 			if (Movie.IsActive() && ReadOnly)
 			{
@@ -331,7 +330,7 @@ namespace BizHawk.Client.Common
 			return true;
 		}
 
-		public bool HandleMovieLoadState_HackyStep2(TextReader reader)
+		public bool HandleMovieLoadState(TextReader reader)
 		{
 			if (Movie.NotActive())
 			{
diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
index 2f5f2c606f..67e3961f15 100644
--- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
+++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -25,9 +25,8 @@ namespace BizHawk.Client.Common
 		void HandleMovieAfterFrameLoop();
 		void HandleMovieSaveState(TextWriter writer);
 
-		// To function as a MovieSession, you must have hacky LoadState steps, non-hacky steps just won't do
-		bool HandleMovieLoadState_HackyStep1(TextReader reader);
-		bool HandleMovieLoadState_HackyStep2(TextReader reader);
+		bool CheckSavestateTimeline(TextReader reader);
+		bool HandleMovieLoadState(TextReader reader);
 
 		ILogEntryGenerator LogGeneratorInstance();