ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MovieSession - rename hacky step 1 and 2 to meaningful names

This commit is contained in:
adelikat 2020-02-02 11:39:54 -06:00
parent 8f7b0aaac9
commit 4c9ebf6ed4
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.Common/SavestateManager.cs
View File

@ -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;

5
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -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())
{

5
BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
View File

@ -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();