+ Fixed warnings

+ Added SBaseDumpData to the makefiles
This commit is contained in:
Ladislav Zezula
2013-12-12 11:15:16 +01:00
parent 5106d34fda
commit 6961cd51b6
12 changed files with 54 additions and 40 deletions

View File

@@ -229,12 +229,10 @@ void SetBits(
//-----------------------------------------------------------------------------
// Support for MPQ header
static DWORD GetMaxFileOffset32(TMPQArchive * ha, TMPQBlock * pBlockTable, DWORD dwBlockTableSize)
static DWORD GetMaxFileOffset32(TMPQArchive * ha)
{
TMPQHeader * pHeader = ha->pHeader;
DWORD dwMaxFileOffset = ha->pHeader->dwArchiveSize;
DWORD dwByteOffset;
DWORD dwBlockIndex;
// We can call this only for malformed archives v 1.0
assert(ha->pHeader->wFormatVersion == MPQ_FORMAT_VERSION_1);
@@ -2230,7 +2228,7 @@ static void FixCompressedFileSize(
if(SortTable != NULL)
{
// Calculate the end of the archive
dwMaxFileOffs = GetMaxFileOffset32(ha, pBlockTable, pHeader->dwBlockTableSize);
dwMaxFileOffs = GetMaxFileOffset32(ha);
// Put all blocks to a sort table
for(pBlock = pBlockTable; pBlock < pBlockTableEnd; pBlock++)
@@ -2751,7 +2749,7 @@ int RebuildFileTable(TMPQArchive * ha, DWORD dwNewHashTableSize, DWORD dwNewMaxF
}
// Move the file entry by one
*pFileEntry++;
pFileEntry++;
}
}