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

Movie Session - move some logic out of hacky step 1 and into hacky step 2

This commit is contained in:
adelikat 2020-02-02 11:38:12 -06:00
parent 8c99e87867
commit 8f7b0aaac9
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,12 +318,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)
{
if (!Movie.IsActive())
{
return true;
}
if (ReadOnly)
if (Movie.IsActive() && ReadOnly)
{
var result = Movie.CheckTimeLines(reader, out var errorMsg);
if (!result)
@ -331,7 +326,20 @@ namespace BizHawk.Client.Common
Output(errorMsg);
return false;
}
}
return true;
}
public bool HandleMovieLoadState_HackyStep2(TextReader reader)
{
if (Movie.NotActive())
{
return true;
}
if (ReadOnly)
{
if (Movie.IsRecording())
{
Movie.SwitchToPlay();
@ -351,23 +359,7 @@ namespace BizHawk.Client.Common
{
Movie.SwitchToRecord();
}
}
return true;
}
public bool HandleMovieLoadState_HackyStep2(TextReader reader)
{
if (Movie.NotActive())
{
return true;
}
if (ReadOnly)
{
}
else
{
var result = Movie.ExtractInputLog(reader, out var errorMsg);
if (!result)
{