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

Fix loading of post movie savestates (savestates made while in movie finished mode). Complete fix When in read-only. While in read+write it throws a loadstate error. This isn't ideal but at least prevents possible movie corruption.

This commit is contained in:
andres.delikat 2011-09-29 01:46:35 +00:00
parent cf8216ac46
commit fbc365c4d2
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BizHawk.MultiClient/MainForm.Movie.cs
View File

@ -166,35 +166,31 @@ namespace BizHawk.MultiClient
{
if (ReadOnly)
{
//if (Global.Emulator.Frame > Global.MovieSession.Movie.Length())
//{
//Post movie savestate
//There is no movie data to load, and the movie will stay in movie finished mode
//So do nothing
//}
//else
{
if (!Global.MovieSession.Movie.CheckTimeLines(path, false))
return false; //Timeline/GUID error
Global.MovieSession.Movie.StartPlayback();
SetMainformMovieInfo();
if (Global.MovieSession.Movie.Mode == MOVIEMODE.FINISHED)
Global.MovieSession.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
else
{
Global.MovieSession.Movie.StartPlayback();
SetMainformMovieInfo();
}
}
}
else
{
//if (Global.Emulator.Frame > Global.MovieSession.Movie.Length()) //TODO: we haven't changed the emulator frame so this doesn't make sense!
//{
//Post movie savestate
//There is no movie data to load, and the movie will stay in movie finished mode
//So do nothing
//}
//else
{
if (!Global.MovieSession.Movie.CheckTimeLines(path, true))
return false; //GUID Error
Global.MovieSession.Movie.StartNewRecording();
SetMainformMovieInfo();
Global.MovieSession.Movie.LoadLogFromSavestateText(path);
if (Global.MovieSession.Movie.Mode == MOVIEMODE.FINISHED)
Global.MovieSession.LatchInputFromPlayer(Global.MovieInputSourceAdapter);
else
{
Global.MovieSession.Movie.StartNewRecording();
SetMainformMovieInfo();
Global.MovieSession.Movie.LoadLogFromSavestateText(path);
}
}
}
}

14
BizHawk.MultiClient/movie/Movie.cs
View File

@ -610,7 +610,19 @@ namespace BizHawk.MultiClient
return true;
}
if (stateFrame == 0 || stateFrame > l.Length())
if (stateFrame > l.Length()) //stateFrame is greater than state input log, so movie finished mode
{
if (Mode == MOVIEMODE.PLAY || Mode == MOVIEMODE.FINISHED)
{
Mode = MOVIEMODE.FINISHED;
return true;
}
else
return false; //For now throw an error if recording, ideally what should happen is that the state gets loaded, and the movie set to movie finished, the movie at its current state is preserved and the state is loaded just fine. This should probably also only happen if checktimelines passes
}
if (stateFrame == 0)
{
stateFrame = l.Length(); //In case the frame count failed to parse, revert to using the entire state input log
}