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

movies - remove legacy support for hex frame number, it's been quite some time since cores were in charge of this value, and thus a core specific hack, due to copy pasta, there's a lot to delete here

This commit is contained in:
adelikat 2020-06-03 17:35:07 -05:00
parent 246d7ec2d5
commit b3234d029c
2 changed files with 4 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs
View File

@ -56,23 +56,7 @@ namespace BizHawk.Client.Common
break;
}
// in BK2, this is part of the input log, and not involved with the core state at all
// accordingly, this case (for special neshawk format frame numbers) is irrelevant
// probably
if (line.Contains("Frame 0x")) // NES stores frame count in hex, yay
{
var strs = line.Split('x');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch
{
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.Contains("Frame "))
if (line.Contains("Frame "))
{
var strs = line.Split(' ');
try
@ -106,20 +90,7 @@ namespace BizHawk.Client.Common
break;
}
if (line.Contains("Frame 0x")) // NES stores frame count in hex, yay
{
var strs = line.Split('x');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch
{
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.Contains("Frame "))
if (line.Contains("Frame "))
{
var strs = line.Split(' ');
try

30
src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -200,20 +200,7 @@ namespace BizHawk.Client.Common
break;
}
if (line.Contains("Frame 0x")) // NES stores frame count in hex, yay
{
var split = line.Split('x');
try
{
stateFrame = int.Parse(split[1], NumberStyles.HexNumber);
}
catch
{
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.Contains("Frame "))
if (line.Contains("Frame "))
{
var split = line.Split(' ');
try
@ -257,20 +244,7 @@ namespace BizHawk.Client.Common
break;
}
if (line.Contains("Frame 0x")) // NES stores frame count in hex, yay
{
var strs = line.Split('x');
try
{
stateFrame = int.Parse(strs[1], NumberStyles.HexNumber);
}
catch
{
errorMessage = "Savestate Frame number failed to parse";
return false;
}
}
else if (line.Contains("Frame "))
if (line.Contains("Frame "))
{
var strs = line.Split(' ');
try