lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update ArcDX8.cs

Browse Source 
We already read the entry to the array. Don't attempt to read twice. Or in other words, just copy from the prepared array.
This commit is contained in:
Sławomir Śpiewak
2024-08-14 18:30:45 +02:00
parent 0817dacd99
commit d2a22fa2fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ArcFormats/DxLib/ArcDX8.cs
View File

@@ -178,7 +178,7 @@ namespace GameRes.Formats.DxLib
entries = reader.Read(); entries = reader.Read();
} }
return new DxArchive8(file, this,entries ,key, 8,dx.HuffmanKB); return new DxArchive8(file, this,entries ,key, 8,dx.HuffmanKB);
//return null; //retu rn null;
} }
public override Stream OpenEntry(ArcFile arc, Entry entry) public override Stream OpenEntry(ArcFile arc, Entry entry)
@@ -188,7 +188,7 @@ namespace GameRes.Formats.DxLib
if (null == dx_arc) if (null == dx_arc)
return input; return input;
var dx_ent = (DXA8PackedEntry)entry; var dx_ent = (DXA8PackedEntry)entry;
long dec_offset = dx_ent.UnpackedSize; //is this still right? long dec_offset = dx_ent.UnpackedSize;
var key = dx_arc.Encryption.GetEntryKey(dx_ent.Name); var key = dx_arc.Encryption.GetEntryKey(dx_ent.Name);
input = new EncryptedStream(input, dec_offset, key); input = new EncryptedStream(input, dec_offset, key);
if (!dx_ent.HuffmanCompressed && !dx_ent.IsPacked) if (!dx_ent.HuffmanCompressed && !dx_ent.IsPacked)
@@ -212,7 +212,7 @@ namespace GameRes.Formats.DxLib
Array.Copy(partTmpBuffer,0, outBuffer, 0,dx_arc.huffmanMaxKB*1024); Array.Copy(partTmpBuffer,0, outBuffer, 0,dx_arc.huffmanMaxKB*1024);
Array.Copy(partTmpBuffer,dx_arc.huffmanMaxKB*1024,outBuffer,outBuffer.Length-dx_arc.huffmanMaxKB*1024,dx_arc.huffmanMaxKB*1024); Array.Copy(partTmpBuffer,dx_arc.huffmanMaxKB*1024,outBuffer,outBuffer.Length-dx_arc.huffmanMaxKB*1024,dx_arc.huffmanMaxKB*1024);
//uncompressed part goes into middle. //uncompressed part goes into middle.
input.Read(outBuffer, dx_arc.huffmanMaxKB * 1024, outBuffer.Length-dx_arc.huffmanMaxKB*1024*2); Array.Copy(tmpBuffer, dx_ent.HuffmanSize, outBuffer, dx_arc.huffmanMaxKB * 1024, outBufSize - dx_arc.huffmanMaxKB * 1024 * 2);
tmpBuffer = outBuffer; tmpBuffer = outBuffer;
} else } else
{ {