Mirror/StormLib
1
0
Fork 0
mirror of https://github.com/ladislav-zezula/StormLib.git synced 2026-02-03 21:16:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regression tests

Browse Source
This commit is contained in:
Ladislav Zezula
2022-02-12 21:14:55 +01:00
parent 7359c07c46
commit 6a107601c6
2 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/SBaseFileTable.cpp
View File

@@ -885,28 +885,6 @@ static TMPQHash * DefragmentHashTable(
}
*/
static void DeleteInvalidHashTableEntries(TMPQArchive * ha, TMPQHash * pHashTable, TMPQBlock * pBlockTable)
{
TMPQHeader * pHeader = ha->pHeader;
TMPQHash * pHashTableEnd = pHashTable + pHeader->dwHashTableSize;
TMPQHash * pHash = pHashTable;
// Sanity checks
assert(pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1);
assert(pHeader->HiBlockTablePos64 == 0);
// Parse the hash table and move the entries to the begin of it
for(pHash = pHashTable; pHash < pHashTableEnd; pHash++)
{
// Check whether this is a valid hash table entry
if(!IsValidHashEntry1(ha, pHash, pBlockTable))
{
memset(pHash, 0xFF, sizeof(TMPQHash));
pHash->dwBlockIndex = HASH_ENTRY_DELETED;
}
}
}
static DWORD BuildFileTableFromBlockTable(
TMPQArchive * ha,
TMPQBlock * pBlockTable)
@@ -936,12 +914,11 @@ static DWORD BuildFileTableFromBlockTable(
// Example MPQ: MPQ_2022_v1_Sniper.scx
//
if(ha->dwFlags & MPQ_FLAG_HASH_TABLE_CUT)
{
//ha->pHashTable = DefragmentHashTable(ha, ha->pHashTable, pBlockTable);
//ha->dwMaxFileCount = pHeader->dwHashTableSize;
DeleteInvalidHashTableEntries(ha, ha->pHashTable, pBlockTable);
}
//if(ha->dwFlags & MPQ_FLAG_HASH_TABLE_CUT)
//{
// ha->pHashTable = DefragmentHashTable(ha, ha->pHashTable, pBlockTable);
// ha->dwMaxFileCount = pHeader->dwHashTableSize;
//}
// If the hash table or block table is cut,
// we will defragment the block table