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

Merge pull request #2266 from TASVideos/ps2-disque-check 

Reorder the optical disk id checks
This commit is contained in:
zeromus 2020-08-03 16:43:15 -04:00 committed by GitHub
parent 12ef0fe35b 8e8575ad69
commit 93c3f0f217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/BizHawk.Emulation.DiscSystem/DiscIdentifier.cs
View File

@ -190,6 +190,14 @@ namespace BizHawk.Emulation.DiscSystem
//its a cheap win for a lot of systems, but ONLY if the iso.Parse() method is quick running (might have to time it) //its a cheap win for a lot of systems, but ONLY if the iso.Parse() method is quick running (might have to time it)
if (isIso) if (isIso)
{ {
if (iso.Root.Children.TryGetValue("SYSTEM.CNF;1", out var cnf))
{
if (SectorContains("BOOT2", (int)cnf.Offset))
return DiscType.SonyPS2;
else if (SectorContains("BOOT", (int)cnf.Offset))
return DiscType.SonyPSX;
}
var appId = Encoding.ASCII.GetString(iso.VolumeDescriptors[0].ApplicationIdentifier).TrimEnd('\0', ' '); var appId = Encoding.ASCII.GetString(iso.VolumeDescriptors[0].ApplicationIdentifier).TrimEnd('\0', ' ');
var sysId = Encoding.ASCII.GetString(iso.VolumeDescriptors[0].SystemIdentifier).TrimEnd('\0', ' '); var sysId = Encoding.ASCII.GetString(iso.VolumeDescriptors[0].SystemIdentifier).TrimEnd('\0', ' ');
@ -222,14 +230,6 @@ namespace BizHawk.Emulation.DiscSystem
return DiscType.Amiga; return DiscType.Amiga;
} }
if (iso.Root.Children.TryGetValue("SYSTEM.CNF;1", out var cnf))
{
if (SectorContains("BOOT2", (int)cnf.Offset))
return DiscType.SonyPS2;
else if (SectorContains("BOOT", (int)cnf.Offset))
return DiscType.SonyPSX;
}
// NeoGeoCD Check // NeoGeoCD Check
var absTxt = iso.Root.Children.Where(kvp => kvp.Key.Contains("ABS.TXT")).Select(kvp => kvp.Value).FirstOrDefault(); var absTxt = iso.Root.Children.Where(kvp => kvp.Key.Contains("ABS.TXT")).Select(kvp => kvp.Value).FirstOrDefault();
if (absTxt != null && SectorContains("abstracted by snk", Convert.ToInt32(absTxt.Offset))) return DiscType.NeoGeoCD; if (absTxt != null && SectorContains("abstracted by snk", Convert.ToInt32(absTxt.Offset))) return DiscType.NeoGeoCD;