Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-27 15:44:00 +08:00
Code Issues Projects Releases Wiki Activity

(DatOpener.QueryScheme): added game lookup by filename.

Browse Source
This commit is contained in:
morkt 2016-10-24 19:54:47 +04:00
parent cd5304f083
commit 3034d55d47
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArcFormats/NonColor/ArcDAT.cs
View File

@ -107,12 +107,13 @@ namespace GameRes.Formats.NonColor
if (!IsSaneCount (count)) if (!IsSaneCount (count))
return null; return null;
var scheme = QueryScheme(); var scheme = QueryScheme (file.Name);
if (null == scheme) if (null == scheme)
return null; return null;
var file_map = ReadFilenameMap (scheme); var file_map = ReadFilenameMap (scheme);
uint index_offset = 4; uint index_offset = 4;
int skipped = 0;
var dir = new List<Entry> (count); var dir = new List<Entry> (count);
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
@ -135,7 +136,8 @@ namespace GameRes.Formats.NonColor
} }
else else
{ {
System.Diagnostics.Trace.WriteLine ("Unknown hash", hash.ToString ("X8")); // System.Diagnostics.Trace.WriteLine ("Unknown hash", hash.ToString ("X8"));
++skipped;
continue; continue;
} }
if (flags != 2) if (flags != 2)
@ -160,6 +162,8 @@ namespace GameRes.Formats.NonColor
return null; return null;
dir.Add (entry); dir.Add (entry);
} }
if (skipped != 0)
System.Diagnostics.Trace.WriteLine (string.Format ("Missing {0} names", skipped));
return new ArcDatArchive (file, this, dir, scheme.Hash); return new ArcDatArchive (file, this, dir, scheme.Hash);
} }
@ -259,8 +263,11 @@ namespace GameRes.Formats.NonColor
set { KnownSchemes = ((ArcDatScheme)value).KnownSchemes; } set { KnownSchemes = ((ArcDatScheme)value).KnownSchemes; }
} }
Scheme QueryScheme () Scheme QueryScheme (string arc_name)
{ {
var title = FormatCatalog.Instance.LookupGame (arc_name);
if (!string.IsNullOrEmpty (title) && KnownSchemes.ContainsKey (title))
return KnownSchemes[title];
var options = Query<ArcDatOptions> (arcStrings.ArcEncryptedNotice); var options = Query<ArcDatOptions> (arcStrings.ArcEncryptedNotice);
Scheme scheme; Scheme scheme;
if (string.IsNullOrEmpty (options.Scheme) || !KnownSchemes.TryGetValue (options.Scheme, out scheme)) if (string.IsNullOrEmpty (options.Scheme) || !KnownSchemes.TryGetValue (options.Scheme, out scheme))