Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-30 17:05:37 +08:00
Code Issues Projects Releases Wiki Activity

cosmetic changes.

Browse Source
This commit is contained in:
morkt 2014-07-29 07:05:28 +04:00
parent 3e2bab9dac
commit 32b33e5433
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ArcFormats/ArcXP3.cs
View File

@ -229,10 +229,10 @@ namespace GameRes.Formats.KiriKiri
if (!string.IsNullOrEmpty (entry.Name) && entry.Segments.Any()) if (!string.IsNullOrEmpty (entry.Name) && entry.Segments.Any())
{ {
dir.Add (entry); dir.Add (entry);
Trace.WriteLine (string.Format ("{0,-16} {3:X8} {1,11} {2,12}", entry.Name, // Trace.WriteLine (string.Format ("{0,-16} {3:X8} {1,11} {2,12}", entry.Name,
entry.IsEncrypted ? "[encrypted]" : "", // entry.IsEncrypted ? "[encrypted]" : "",
entry.Segments.First().IsCompressed ? "[compressed]" : "", // entry.Segments.First().IsCompressed ? "[compressed]" : "",
entry.Hash)); // entry.Hash));
} }
NextEntry: NextEntry:
header.BaseStream.Position = dir_offset; header.BaseStream.Position = dir_offset;
@ -269,11 +269,6 @@ NextEntry:
}; };
} }
public override ResourceOptions GetOptions (object widget)
{
return this.GetDefaultOptions();
}
public override object GetCreationWidget () public override object GetCreationWidget ()
{ {
return new GUI.CreateXP3Widget(); return new GUI.CreateXP3Widget();
@ -529,7 +524,8 @@ NextEntry:
try try
{ {
var checksum = new Adler32(); var checksum = new Adler32();
if (!xp3entry.Cipher.HashAfterCrypt) bool hash_after_crypt = xp3entry.Cipher.HashAfterCrypt;
if (!hash_after_crypt)
xp3entry.Hash = checksum.Update (ptr, (int)unpacked_size); xp3entry.Hash = checksum.Update (ptr, (int)unpacked_size);
int offset = 0; int offset = 0;
int remaining = (int)unpacked_size; int remaining = (int)unpacked_size;
@ -539,12 +535,12 @@ NextEntry:
remaining -= amount; remaining -= amount;
Marshal.Copy ((IntPtr)(ptr+offset), read_buffer, 0, amount); Marshal.Copy ((IntPtr)(ptr+offset), read_buffer, 0, amount);
xp3entry.Cipher.Encrypt (xp3entry, offset, read_buffer, 0, amount); xp3entry.Cipher.Encrypt (xp3entry, offset, read_buffer, 0, amount);
if (xp3entry.Cipher.HashAfterCrypt) if (hash_after_crypt)
checksum.Update (read_buffer, 0, amount); checksum.Update (read_buffer, 0, amount);
output.Write (read_buffer, 0, amount); output.Write (read_buffer, 0, amount);
offset += amount; offset += amount;
} }
if (xp3entry.Cipher.HashAfterCrypt) if (hash_after_crypt)
xp3entry.Hash = checksum.Value; xp3entry.Hash = checksum.Value;
if (compress) if (compress)
{ {