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

Fixed Loadstate stream issues, rerecording is now possible again

This commit is contained in:
andres.delikat 2011-08-20 19:27:00 +00:00
parent 27478a5feb
commit 276c759d88
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,7 +110,7 @@ namespace BizHawk.MultiClient
}
}
private bool HandleMovieLoadState(StreamReader reader)
private bool HandleMovieLoadState(string path)
{
//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.Mode == MOVIEMODE.INACTIVE)
@ -122,7 +122,7 @@ namespace BizHawk.MultiClient
if (ReadOnly)
{
if (!UserMovie.CheckTimeLines(reader, false))
if (!UserMovie.CheckTimeLines(path, false))
return false; //Timeline/GUID error
else
{
@ -133,26 +133,26 @@ namespace BizHawk.MultiClient
}
else
{
if (!UserMovie.CheckTimeLines(reader, true))
if (!UserMovie.CheckTimeLines(path, true))
return false; //GUID Error
UserMovie.LoadLogFromSavestateText(reader);
UserMovie.LoadLogFromSavestateText(path);
}
}
else if (UserMovie.Mode == MOVIEMODE.PLAY)
{
if (ReadOnly)
{
if (!UserMovie.CheckTimeLines(reader, false))
if (!UserMovie.CheckTimeLines(path, false))
return false; //Timeline/GUID error
//Frame loop automatically handles the rewinding effect based on Global.Emulator.Frame so nothing else is needed here
}
else
{
if (!UserMovie.CheckTimeLines(reader, true))
if (!UserMovie.CheckTimeLines(path, true))
return false; //GUID Error
UserMovie.StartNewRecording(!Global.MovieSession.MultiTrack.IsActive);
SetMainformMovieInfo();
UserMovie.LoadLogFromSavestateText(reader);
UserMovie.LoadLogFromSavestateText(path);
}
}
else if (UserMovie.Mode == MOVIEMODE.FINISHED)
@ -167,7 +167,7 @@ namespace BizHawk.MultiClient
}
else
{
if (!UserMovie.CheckTimeLines(reader, false))
if (!UserMovie.CheckTimeLines(path, false))
return false; //Timeline/GUID error
UserMovie.StartPlayback();
SetMainformMovieInfo();
@ -183,11 +183,11 @@ namespace BizHawk.MultiClient
}
else
{
if (!UserMovie.CheckTimeLines(reader, true))
if (!UserMovie.CheckTimeLines(path, true))
return false; //GUID Error
UserMovie.StartNewRecording();
SetMainformMovieInfo();
UserMovie.LoadLogFromSavestateText(reader);
UserMovie.LoadLogFromSavestateText(path);
}
}
}

6
BizHawk.MultiClient/MainForm.cs
View File

@ -1731,11 +1731,9 @@ namespace BizHawk.MultiClient
private void LoadStateFile(string path, string name)
{
var reader = new StreamReader(path);
if (HandleMovieLoadState(reader))
if (HandleMovieLoadState(path))
{
reader.BaseStream.Position = 0; //Reset position after movie code has had its way with it
var reader = new StreamReader(path);
Global.Emulator.LoadStateText(reader);
UpdateTools();
reader.Close();

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

@ -324,8 +324,9 @@ namespace BizHawk.MultiClient
writer.WriteLine("[/Input]");
}
public void LoadLogFromSavestateText(TextReader reader)
public void LoadLogFromSavestateText(string path)
{
var reader = new StreamReader(path);
//We are in record mode so replace the movie log with the one from the savestate
if (!Global.MovieSession.MultiTrack.IsActive)
{
@ -338,6 +339,10 @@ namespace BizHawk.MultiClient
while (true)
{
string line = reader.ReadLine();
if (line.Contains(".[NES"))
{
MessageBox.Show("OOPS!");
}
if (line == null) break;
if (line.Trim() == "") continue;
if (line == "[Input]") continue;
@ -368,6 +373,7 @@ namespace BizHawk.MultiClient
Log.Truncate(Global.Emulator.Frame);
}
IncrementRerecords();
reader.Close();
}
public void IncrementRerecords()
@ -477,10 +483,10 @@ namespace BizHawk.MultiClient
}
}
public bool CheckTimeLines(StreamReader reader, bool OnlyGUID)
public bool CheckTimeLines(string path, bool OnlyGUID)
{
//This function will compare the movie data to the savestate movie data to see if they match
var reader = new StreamReader(path);
MovieLog l = new MovieLog();
string line;
string GUID;
@ -500,11 +506,14 @@ namespace BizHawk.MultiClient
MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result == DialogResult.No)
{
reader.Close();
return false;
}
}
else if (OnlyGUID)
{
reader.BaseStream.Position = 0;
reader.Close();
return true;
}
}
@ -512,18 +521,22 @@ namespace BizHawk.MultiClient
else if (line == "[/Input]") break;
else if (line[0] == '|')
l.AddFrame(line);
}
reader.BaseStream.Position = 0; //Reset position because this stream may be read again by other code
if (OnlyGUID) return true;
if (OnlyGUID)
{
reader.Close();
return true;
}
if (Log.Length() < l.Length())
{
//Future event error
MessageBox.Show("The savestate is from frame " + l.Length().ToString() + " which is greater than the current movie length of " +
Log.Length().ToString() + ".\nCan not load this savestate.", "Future event Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
reader.Close();
return false;
}
for (int x = 0; x < Log.Length(); x++)
@ -535,9 +548,11 @@ namespace BizHawk.MultiClient
//TimeLine Error
MessageBox.Show("The savestate input does not match the movie input at frame " + (x + 1).ToString() + ".",
"Timeline Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
reader.Close();
return false;
}
}
reader.Close();
return true;
}