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

Movies - fix problem with NES loadstate & timeline checks that caused the Frame value to not parse properly. Also add messages to the catch statement in the event of parse failure.

This commit is contained in:
andres.delikat 2011-09-10 02:08:16 +00:00
parent e8c3da9c1f
commit 5eba8bc7f3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,12 +359,12 @@ namespace BizHawk.MultiClient
else if (line == "[/Input]") break;
else if (line.Contains("Frame 0x")) //NES stores frame count in hex, yay
{
string[] strs = line.Split(' ');
string[] strs = line.Split('x');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch { } //TODO: message?
catch { Global.RenderPanel.AddMessage("Savestate Frame failed to parse"); } //TODO: message?
}
else if (line.Contains("Frame "))
{
@ -373,7 +373,7 @@ namespace BizHawk.MultiClient
{
stateFrame = int.Parse(strs[1]);
}
catch { } //TODO: message?
catch { Global.RenderPanel.AddMessage("Savestate Frame failed to parse"); } //TODO: message?
}
if (line[0] == '|')
{
@ -570,12 +570,12 @@ namespace BizHawk.MultiClient
}
else if (line.Contains("Frame 0x")) //NES stores frame count in hex, yay
{
string[] strs = line.Split(' ');
string[] strs = line.Split('x');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch { } //TODO: message?
catch { Global.RenderPanel.AddMessage("Savestate Frame number failed to parse"); }
}
else if (line.Contains("Frame "))
{
@ -584,7 +584,7 @@ namespace BizHawk.MultiClient
{
stateFrame = int.Parse(strs[1]);
}
catch { } //TODO: message?
catch { Global.RenderPanel.AddMessage("Savestate Frame number failed to parse"); }
}
else if (line == "[Input]") continue;
else if (line == "[/Input]") break;
@ -600,8 +600,10 @@ namespace BizHawk.MultiClient
return true;
}
if (stateFrame == 0 || stateFrame > l.Length())
if (stateFrame == 0 || stateFrame > l.Length())
{
stateFrame = l.Length(); //In case the frame count failed to parse, revert to using the entire state input log
}
if (Log.Length() < stateFrame)
{
//Future event error