gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-11 19:17:09 -05:00
Code Issues Releases Wiki Activity

MPQ memory improvements (#399)

Browse Source
This commit is contained in:
Intyre 2020-06-22 22:01:14 +02:00 committed by GitHub
parent 2835ff4cf1
commit 0c27ae63e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
d2common/d2fileformats/d2mpq/mpq.go
View File

@ -160,11 +160,13 @@ func (v *MPQ) loadHashTable() {
log.Panic(err) log.Panic(err)
} }
hashData := make([]uint32, v.Data.HashTableEntries*4) hashData := make([]uint32, v.Data.HashTableEntries*4)
err = binary.Read(v.File, binary.LittleEndian, &hashData) hash := make([]byte, 4)
if err != nil { for i := range hashData {
log.Panic(err) v.File.Read(hash[:])
hashData[i] = binary.LittleEndian.Uint32(hash)
} }
decrypt(hashData, hashString("(hash table)", 3)) decrypt(hashData, hashString("(hash table)", 3))
for i := uint32(0); i < v.Data.HashTableEntries; i++ { for i := uint32(0); i < v.Data.HashTableEntries; i++ {
v.HashEntryMap.Insert(&HashTableEntry{ v.HashEntryMap.Insert(&HashTableEntry{
NamePartA: hashData[i*4], NamePartA: hashData[i*4],
@ -182,12 +184,15 @@ func (v *MPQ) loadBlockTable() {
if err != nil { if err != nil {
log.Panic(err) log.Panic(err)
} }
blockData := make([]uint32, v.Data.BlockTableEntries*4) blockData := make([]uint32, v.Data.BlockTableEntries*4)
err = binary.Read(v.File, binary.LittleEndian, &blockData) hash := make([]byte, 4)
if err != nil { for i := range blockData {
log.Panic(err) v.File.Read(hash[:])
blockData[i] = binary.LittleEndian.Uint32(hash)
} }
decrypt(blockData, hashString("(block table)", 3)) decrypt(blockData, hashString("(block table)", 3))
for i := uint32(0); i < v.Data.BlockTableEntries; i++ { for i := uint32(0); i < v.Data.BlockTableEntries; i++ {
v.BlockTableEntries = append(v.BlockTableEntries, BlockTableEntry{ v.BlockTableEntries = append(v.BlockTableEntries, BlockTableEntry{
FilePosition: blockData[(i * 4)], FilePosition: blockData[(i * 4)],