(IPAC): use PackedEntry.

This commit is contained in:
morkt 2018-10-27 09:56:37 +04:00
parent 02ee9b0802
commit 81c9e91a14

View File

@ -33,7 +33,7 @@ namespace GameRes.Formats.BaseUnit
[Export(typeof(ArchiveFormat))] [Export(typeof(ArchiveFormat))]
public class PakOpener : ArchiveFormat public class PakOpener : ArchiveFormat
{ {
public override string Tag { get { return "IPAC"; } } public override string Tag { get { return "PAK/IPAC"; } }
public override string Description { get { return "IPAC resource archive"; } } public override string Description { get { return "IPAC resource archive"; } }
public override uint Signature { get { return 0x43415049; } } // 'IPAC' public override uint Signature { get { return 0x43415049; } } // 'IPAC'
public override bool IsHierarchic { get { return false; } } public override bool IsHierarchic { get { return false; } }
@ -50,7 +50,7 @@ namespace GameRes.Formats.BaseUnit
for (int i = 0; i < count; ++i) for (int i = 0; i < count; ++i)
{ {
var name = file.View.ReadString (index_offset, 0x20); var name = file.View.ReadString (index_offset, 0x20);
var entry = FormatCatalog.Instance.Create<Entry> (name); var entry = Create<PackedEntry> (name);
entry.Offset = file.View.ReadUInt32 (index_offset+0x24); entry.Offset = file.View.ReadUInt32 (index_offset+0x24);
entry.Size = file.View.ReadUInt32 (index_offset+0x28); entry.Size = file.View.ReadUInt32 (index_offset+0x28);
if (!entry.CheckPlacement (file.MaxOffset)) if (!entry.CheckPlacement (file.MaxOffset))
@ -63,8 +63,14 @@ namespace GameRes.Formats.BaseUnit
public override Stream OpenEntry (ArcFile arc, Entry entry) public override Stream OpenEntry (ArcFile arc, Entry entry)
{ {
if (!arc.File.View.AsciiEqual (entry.Offset, "IEL1")) var pent = (PackedEntry)entry;
return base.OpenEntry (arc, entry); if (!pent.IsPacked)
{
if (!arc.File.View.AsciiEqual (entry.Offset, "IEL1"))
return base.OpenEntry (arc, entry);
pent.IsPacked = true;
pent.UnpackedSize = arc.File.View.ReadUInt32 (entry.Offset+4);
}
var input = arc.File.CreateStream (entry.Offset+8, entry.Size-8); var input = arc.File.CreateStream (entry.Offset+8, entry.Size-8);
return new LzssStream (input); return new LzssStream (input);
} }