claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix new SL dats

Browse Source 
New SL dats have the size in the dataarea tag and NOT the rom tag. This should fix the issues from that.
This commit is contained in:
Matt Nadareski
2016-05-14 14:59:40 -07:00
parent 741af21e72
commit f3b3b4c915
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
SabreHelper/RomManipulation.cs
View File

@@ -449,8 +449,23 @@ namespace SabreTools.Helper
} }
// Get the roms from the machine // Get the roms from the machine
long dataAreaSize = -1;
switch (subreader.Name) switch (subreader.Name)
{ {
case "dataarea":
if (xtr.GetAttribute("size") == null)
{
dataAreaSize = -1;
}
else if (xtr.GetAttribute("size") != null && xtr.GetAttribute("size").Contains("0x"))
{
dataAreaSize = Convert.ToInt64(xtr.GetAttribute("size"), 16);
}
else if (xtr.GetAttribute("size") != null)
{
Int64.TryParse(xtr.GetAttribute("size"), out dataAreaSize);
}
break;
case "rom": case "rom":
case "disk": case "disk":
// If the rom is nodump, skip it // If the rom is nodump, skip it
@@ -460,15 +475,24 @@ namespace SabreTools.Helper
break; break;
} }
// Take care of hex-sized files // If the size was in the dataarea, use that instead
long size = -1; long size = -1;
if (xtr.GetAttribute("size") != null && xtr.GetAttribute("size").Contains("0x")) if (dataAreaSize != -1)
{ {
size = Convert.ToInt64(xtr.GetAttribute("size"), 16); size = dataAreaSize;
dataAreaSize = -1;
} }
else if (xtr.GetAttribute("size") != null) else
{ {
Int64.TryParse(xtr.GetAttribute("size"), out size); // Take care of hex-sized files
if (xtr.GetAttribute("size") != null && xtr.GetAttribute("size").Contains("0x"))
{
size = Convert.ToInt64(xtr.GetAttribute("size"), 16);
}
else if (xtr.GetAttribute("size") != null)
{
Int64.TryParse(xtr.GetAttribute("size"), out size);
}
} }
// Sanitize the hashes from null, hex sizes, and "true blank" strings // Sanitize the hashes from null, hex sizes, and "true blank" strings