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

implemented archive version 2 reading.

Browse Source
This commit is contained in:
morkt 2015-04-12 23:01:05 +04:00
parent c1614a20c7
commit 0183e8be52
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ArcFormats/ArcMajiro.cs
View File

@ -70,8 +70,8 @@ namespace GameRes.Formats.Majiro
int version; int version;
if (file.View.AsciiEqual (0, "MajiroArcV1.000\0")) if (file.View.AsciiEqual (0, "MajiroArcV1.000\0"))
version = 1; version = 1;
// else if (file.View.AsciiEqual (0, "MajiroArcV2.000\0")) else if (file.View.AsciiEqual (0, "MajiroArcV2.000\0"))
// version = 2; version = 2;
else else
return null; return null;
int count = file.View.ReadInt32 (16); int count = file.View.ReadInt32 (16);
@ -81,7 +81,8 @@ namespace GameRes.Formats.Majiro
|| data_offset >= file.MaxOffset) || data_offset >= file.MaxOffset)
return null; return null;
int table_size = count + (1 == version ? 1 : 0); int table_size = count + (1 == version ? 1 : 0);
table_size *= 4 * (version+1); int entry_size = 4 * (version + 1);
table_size *= entry_size;
if (table_size + 0x1c != names_offset) if (table_size + 0x1c != names_offset)
return null; return null;
if (data_offset > file.View.Reserve (0, data_offset)) if (data_offset > file.View.Reserve (0, data_offset))
@ -90,7 +91,7 @@ namespace GameRes.Formats.Majiro
var names = new byte[names_size]; var names = new byte[names_size];
file.View.Read (names_offset, names, 0, (uint)names_size); file.View.Read (names_offset, names, 0, (uint)names_size);
int names_pos = 0; int names_pos = 0;
uint table_pos = 0x1c; int table_pos = 0x1c;
uint offset_next = file.View.ReadUInt32 (table_pos+4); uint offset_next = file.View.ReadUInt32 (table_pos+4);
var dir = new List<Entry> (count); var dir = new List<Entry> (count);
@ -104,12 +105,16 @@ namespace GameRes.Formats.Majiro
names_size -= name_len+1; names_size -= name_len+1;
names_pos = zero+1; names_pos = zero+1;
uint offset = offset_next; uint offset = offset_next;
offset_next = file.View.ReadUInt32 (table_pos + 12); offset_next = file.View.ReadUInt32 (table_pos + entry_size + 4);
var entry = FormatCatalog.Instance.CreateEntry (name); var entry = FormatCatalog.Instance.CreateEntry (name);
entry.Offset = offset; entry.Offset = offset;
if (1 == version)
entry.Size = offset_next >= offset ? offset_next - offset : 0; entry.Size = offset_next >= offset ? offset_next - offset : 0;
table_pos += 8; else
if (entry.CheckPlacement (file.MaxOffset)) entry.Size = file.View.ReadUInt32 (table_pos + 8);
table_pos += entry_size;
if (offset < data_offset || !entry.CheckPlacement (file.MaxOffset))
return null;
dir.Add (entry); dir.Add (entry);
} }
if (!dir.Any()) if (!dir.Any())