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

(AbmpOpener): various fixes.

Browse Source
This commit is contained in:
morkt 2015-11-07 09:22:38 +04:00
parent d23a67ea08
commit 6b8a402ce2
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArcFormats/Qlie/ArcABMP.cs
View File

@ -79,15 +79,19 @@ namespace GameRes.Formats.Qlie
for (int i = 0; i < count && offset < file.MaxOffset; ++i) for (int i = 0; i < count && offset < file.MaxOffset; ++i)
{ {
file.View.Read (offset, type_buf, 0, 0x10); file.View.Read (offset, type_buf, 0, 0x10);
var tag = Binary.GetCString (type_buf, 0, 0x10, Encoding.ASCII);
uint name_length = file.View.ReadUInt16 (offset+0x10); uint name_length = file.View.ReadUInt16 (offset+0x10);
var name = file.View.ReadString (offset+0x12, name_length); var name = file.View.ReadString (offset+0x12, name_length);
offset += 0x12 + name_length; offset += 0x12 + name_length;
if (Binary.AsciiEqual (type_buf, "abimgdat"))
if (tag != "abimgdat10" && tag != "absnddat10")
{
offset += 2u + file.View.ReadUInt16 (offset); offset += 2u + file.View.ReadUInt16 (offset);
if (Binary.AsciiEqual (type_buf, "abimgdat13\0")) if ("abimgdat13" == tag)
offset += 0x0C; offset += 0x0C;
else if (Binary.AsciiEqual (type_buf, "abimgdat14\0")) else if ("abimgdat14" == tag)
offset += 0x4C; offset += 0x4C;
}
++offset; ++offset;
var size = file.View.ReadUInt32 (offset); var size = file.View.ReadUInt32 (offset);
offset += 4; offset += 4;
@ -99,7 +103,7 @@ namespace GameRes.Formats.Qlie
name = s_InvalidChars.Replace (name, "_"); name = s_InvalidChars.Replace (name, "_");
var entry = new Entry { var entry = new Entry {
Name = name, Name = name,
Type = Binary.AsciiEqual (type_buf, "abimg") ? "image" : "audio", Type = tag.StartsWith ("abimg") ? "image" : tag.StartsWith ("absnd") ? "audio" : "",
Offset = offset, Offset = offset,
Size = size, Size = size,
}; };