Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 63 additions & 6 deletions ArcFormats/Circus/ArcCircus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,46 @@ public DatOpener ()

public override ArcFile TryOpen (ArcView file)
{
int count = file.View.ReadInt32 (0);
var arcFile = TryOpenFromHeader(file);
if (null != arcFile)
{
return arcFile;
}

arcFile = TryOpenFromFooter(file);

return arcFile;
}

public ArcFile TryOpenFromHeader(ArcView file)
{
int count = file.View.ReadInt32(0);
if (count <= 1 || count > 0xfffff)
return null;
var dir = ReadIndex (file, count, 0x24);
var dir = ReadIndexV1(file, count, 0x24);
if (null == dir)
dir = ReadIndex (file, count, 0x30);
dir = ReadIndexV1(file, count, 0x30);
if (null == dir)
dir = ReadIndex (file, count, 0x3C);
dir = ReadIndexV1(file, count, 0x3C);
if (null == dir)
return null;
return new ArcFile (file, this, dir);
return new ArcFile(file, this, dir);
}

public ArcFile TryOpenFromFooter(ArcView file)
{
int count = file.View.ReadInt32(file.MaxOffset - 4);
if(count <= 1 || count > 0xfffff)
{
return null;
}

var dir = ReadIndexV2(file, count, file.View.ReadInt32(file.MaxOffset - 0x8));

return new ArcFile(file, this, dir);
}

private List<Entry> ReadIndex (ArcView file, int count, int name_length)
private List<Entry> ReadIndexV1 (ArcView file, int count, int name_length)
{
long index_offset = 4;
uint index_size = (uint)((name_length + 4) * count);
Expand Down Expand Up @@ -98,5 +124,36 @@ private List<Entry> ReadIndex (ArcView file, int count, int name_length)
}
return dir;
}

private List<Entry> ReadIndexV2(ArcView file, int count, long start_offset)
{
uint max_index_size = (uint)(count * 0x4C);
long index_offset = start_offset;
var dir = new List<Entry> (count);

file.View.Reserve(start_offset, max_index_size);

for (int i = 0; i < count; i++)
{
int name_length = file.View.ReadByte(index_offset);
index_offset++;

string name = file.View.ReadString(index_offset, (uint)name_length);
index_offset += name_length;

uint entry_size = file.View.ReadUInt32(index_offset);
index_offset += 8;

long entry_offset = file.View.ReadInt32(index_offset);
index_offset += 4;

var entry = FormatCatalog.Instance.Create<Entry>(name);
entry.Size = entry_size;
entry.Offset = entry_offset;
dir.Add(entry);
}

return dir;
}
}
}