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

do non-timeline movie state logic after the core is loaded, fixes input display when loading a state in read-only mode, which has been broken since 2014

This commit is contained in:
adelikat 2020-02-02 11:52:05 -06:00
parent 4c9ebf6ed4
commit 45221eb0ad
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,7 @@ namespace BizHawk.Client.Common
{
var succeed = false;
// Movie timeline check must happen before the core state is loaded
if (Global.MovieSession.Movie.IsActive())
{
bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.CheckSavestateTimeline(tr));
@ -146,12 +147,6 @@ namespace BizHawk.Client.Common
{
return false;
}
bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
if (!succeed)
{
return false;
}
}
using (new SimpleTime("Load Core"))
@ -159,6 +154,16 @@ namespace BizHawk.Client.Common
bl.GetCoreState(br => core.LoadStateBinary(br), tr => core.LoadStateText(tr));
}
// We must handle movie input AFTER the core is loaded to properly handle mode changes, and input latching
if (Global.MovieSession.Movie.IsActive())
{
bl.GetLump(BinaryStateLump.Input, true, tr => succeed = Global.MovieSession.HandleMovieLoadState(tr));
if (!succeed)
{
return false;
}
}
bl.GetLump(BinaryStateLump.Framebuffer, false, PopulateFramebuffer);
string userData = "";

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

@ -343,6 +343,10 @@ namespace BizHawk.Client.Common
{
Movie.SwitchToPlay();
}
else if (Movie.IsPlaying())
{
LatchInputFromLog();
}
else if (Movie.IsFinished())
{
LatchInputFromPlayer(Global.MovieInputSourceAdapter);