universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i'm stupid, TocOffset is SOMETIMES equal to ContentOffset, but we really want ContentOffset

Browse Source
This commit is contained in:
Michael Becker 2022-03-20 23:59:41 -04:00
parent f065ec217c
commit 1f96edaef5
No known key found for this signature in database
GPG Key ID: DA394832305DA332
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/UniversalEditor.Plugins.CRI/DataFormats/FileSystem/CPK/CPKDataFormat.cs
View File

@ -163,6 +163,7 @@ namespace UniversalEditor.Plugins.CRI.DataFormats.FileSystem.CPK
// Rebuilt based on cpk_unpack
// Rebuilt AGAIN based on github.com/esperknight/CriPakTools
DatabaseObjectModel utf_om = ReadUTF("CPK ", br, out _HeaderData);
int utf_checksum = br.ReadInt32(); // maybe checksum?
DatabaseTable dtUTF = utf_om.Tables[0];
HeaderTable = dtUTF;
@ -267,7 +268,7 @@ namespace UniversalEditor.Plugins.CRI.DataFormats.FileSystem.CPK
uint decompressedLength = (uint)dtUTFTOC.Records[i].Fields["FileSize"].Value;
uint compressedLength = (uint)dtUTFTOC.Records[i].Fields["ExtractSize"].Value;
ulong offset = (ulong)dtUTFTOC.Records[i].Fields["FileOffset"].Value;
ulong lContentOffset = (ulong)dtUTF.Records[0].Fields["TocOffset"].Value;
ulong lContentOffset = (ulong)dtUTF.Records[0].Fields["ContentOffset"].Value;
offset += lContentOffset;
File f = fsom.AddFile(fileName);
@ -402,16 +403,17 @@ namespace UniversalEditor.Plugins.CRI.DataFormats.FileSystem.CPK
}
}
private DatabaseObjectModel ReadUTF(string v, Reader br, out byte[] data)
private DatabaseObjectModel ReadUTF(string expectedSignature, Reader br, out byte[] data)
{
string tocSignature = br.ReadFixedLengthString(4);
if (tocSignature != v)
if (tocSignature != expectedSignature)
throw new InvalidDataFormatException();
int unknown1 = br.ReadInt32();
int unknown1 = br.ReadInt32(); // always 255?
// UTF table for TOC
long utf_size = br.ReadInt64(); // size of UTF including "@UTF"
byte[] utf_data = br.ReadBytes(utf_size);
MemoryAccessor ma = new MemoryAccessor(utf_data);