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

Some refactoring of savestate + movie code and laid out the logic for how these situations should be handled

This commit is contained in:
andres.delikat 2011-05-16 15:38:48 +00:00
parent 4a549631e5
commit 85e52c3bcb
2 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
BizHawk.MultiClient/MainForm.cs
View File

@ -1083,6 +1083,56 @@ namespace BizHawk.MultiClient
Global.RenderPanel.AddMessage(sfd.FileName + " saved");
}
private void HandleMovieLoadState(StreamReader reader)
{
//Note, some of the situations in these IF's may be identical and could be combined but I intentionally separated it out for clarity
if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
{
if (ReadOnly)
{
UserMovie.WriteMovie();
UserMovie.StartPlayback();
//run loadstate-readonly function
}
else
{
UserMovie.LoadLogFromSavestateText(reader);
}
}
else if (UserMovie.GetMovieMode() == MOVIEMODE.PLAY)
{
if (ReadOnly)
{
//do a loadstate-read-only function which will check timeline & other factors to determine it is from this movie
}
else
{
//switch to record mode
//LoadLogFromSavestateText()
}
}
else if (UserMovie.GetMovieMode() == MOVIEMODE.FINISHED)
{
if (ReadOnly)
{
//If frame count of savestate less than movie length, loadstate-read-only()
// and switch to Movie play mode
//Else loadstate as if no movie (and no input log?)
}
else
{
//If frame count of savestate less than movie length, LoadLogFromSavestateText()
// and switch to movie record mode
//Else load as if no movie
}
}
else
{
if (InputLog.GetMovieMode() == MOVIEMODE.RECORD)
InputLog.LoadLogFromSavestateText(reader);
}
}
private void LoadState(string name)
{
string path = Global.Game.SaveStatePrefix + "." + name + ".State";
@ -1091,24 +1141,7 @@ namespace BizHawk.MultiClient
var reader = new StreamReader(path);
Global.Emulator.LoadStateText(reader);
//TODO: more logic regarding each movie mode
if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
{
if (UserMovie.GetMovieMode() == MOVIEMODE.RECORD)
{
UserMovie.LoadLogFromSavestateText(reader);
UserMovie.IncrementRerecordCount();
}
}
else
{
if (InputLog.GetMovieMode() == MOVIEMODE.RECORD)
InputLog.LoadLogFromSavestateText(reader);
}
HandleMovieLoadState(reader);
reader.Close();
Global.RenderPanel.AddMessage("Loaded state: " + name);
}
@ -1132,6 +1165,7 @@ namespace BizHawk.MultiClient
var reader = new StreamReader(ofd.FileName);
Global.Emulator.LoadStateText(reader);
HandleMovieLoadState(reader);
reader.Close();
Global.RenderPanel.AddMessage(ofd.FileName + " loaded");
}

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

@ -302,6 +302,7 @@ namespace BizHawk.MultiClient
public void LoadLogFromSavestateText(TextReader reader)
{
//We are in record mode so replace the movie log with the one from the savestate
Log.Clear();
while (true)
{
@ -311,7 +312,10 @@ namespace BizHawk.MultiClient
if (line == "[/Input]") break;
if (line[0] == '|')
Log.AddFrame(line);
}//can this be reduced to just if(line[0] == '|') Log.AddFrame(line) ??
}
//TODO: we can truncate the movie down to the current frame now (in case the savestate has a larger input log)
//However, VBA will load it all, then truncate on the next frame, do we want that?
IncrementRerecordCount();
}
public void IncrementRerecordCount()