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

Movies - fixed major bug in rerecording logic. Loadstate was truncating movie input based on global.emulator.frame BEFORE loading that value! Thus loading a state (in record mode) from an event later than the current frame count was truncating the input, then loading the actual savestate. Movie loadstate now truncates based on the state's frame count

This commit is contained in:
andres.delikat 2011-09-07 01:18:58 +00:00
parent a787fe3c60
commit 45609f4e88
2 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ namespace BizHawk.MultiClient
{
if (!Global.MovieSession.Movie.CheckTimeLines(path, true))
return false; //GUID Error
Global.MovieSession.Movie.StartNewRecording(!Global.MovieSession.MultiTrack.IsActive);
Global.MovieSession.Movie.ResumeRecording();
SetMainformMovieInfo();
Global.MovieSession.Movie.LoadLogFromSavestateText(path);
}

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

@ -97,6 +97,11 @@ namespace BizHawk.MultiClient
Mode = MOVIEMODE.PLAY;
}
public void ResumeRecording()
{
Mode = MOVIEMODE.RECORD;
}
public void CommitFrame(int frameNum, IController source)
{
//if (Global.Emulator.Frame < Log.Length())
@ -323,12 +328,13 @@ namespace BizHawk.MultiClient
for (int x = 0; x < Log.Length(); x++)
writer.WriteLine(Log.GetFrame(x));
writer.WriteLine("[/Input]");
//Global.RenderPanel.AddMessage(Log.Length().ToString() + " frames saved"); //Debug
Global.RenderPanel.AddMessage(Log.Length().ToString() + " frames saved"); //Debug
}
public void LoadLogFromSavestateText(string path)
{
var reader = new StreamReader(path);
int stateFrame = 0;
//We are in record mode so replace the movie log with the one from the savestate
if (!Global.MovieSession.MultiTrack.IsActive)
{
@ -338,18 +344,37 @@ namespace BizHawk.MultiClient
MakeBackup = false;
}
Log.Clear();
int i = 0; //TODO: Debug remove me
while (true)
{
int i = 0; //TODO: Debug remove me
string line = reader.ReadLine();
if (line.Contains(".[NES")) //TODO: Remove debug
{
MessageBox.Show("OOPS! Corrupted file stream");
}
if (line == null) break;
if (line.Trim() == "") continue;
if (line == "[Input]") continue;
if (line == "[/Input]") break;
else if (line.Trim() == "") continue;
else if (line == "[Input]") continue;
else if (line == "[/Input]") break;
else if (line.Contains("Frame 0x")) //NES stores frame count in hex, yay
{
string[] strs = line.Split(' ');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch { } //TODO: message?
}
else if (line.Contains("Frame "))
{
string[] strs = line.Split(' ');
try
{
stateFrame = int.Parse(strs[1]);
}
catch { } //TODO: message?
}
if (line[0] == '|')
{
Log.AddFrame(line);
@ -365,9 +390,27 @@ namespace BizHawk.MultiClient
{
string line = reader.ReadLine();
if (line == null) break;
if (line.Trim() == "") continue;
if (line == "[Input]") continue;
if (line == "[/Input]") break;
else if (line.Trim() == "") continue;
else if (line == "[Input]") continue;
else if (line == "[/Input]") break;
else if (line.Contains("Frame 0x")) //NES stores frame count in hex, yay
{
string[] strs = line.Split(' ');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch { } //TODO: message?
}
else if (line.Contains("Frame "))
{
string[] strs = line.Split(' ');
try
{
stateFrame = int.Parse(strs[1]);
}
catch { } //TODO: message?
}
if (line[0] == '|')
{
Log.SetFrameAt(i, line);
@ -376,7 +419,7 @@ namespace BizHawk.MultiClient
}
//Global.RenderPanel.AddMessage(i.ToString() + " input frames loaded."); //TODO: Remove debug
}
if (Global.Emulator.Frame < Log.Length())
if (stateFrame > 0 && stateFrame < Log.Length())
{
Log.Truncate(Global.Emulator.Frame);
}