diff options
| author | Ladislav Zezula <ladislav.zezula@avast.com> | 2023-02-07 07:31:47 +0100 |
|---|---|---|
| committer | Ladislav Zezula <ladislav.zezula@avast.com> | 2023-02-07 07:31:47 +0100 |
| commit | 01e940f998e64ceb60d39a30d0e40c33be430744 (patch) | |
| tree | 6cebd387986b6870d03161d1bc25d9c1c382651d /src | |
| parent | 0d31856af86ac47801ade118ea93092eab62a101 (diff) | |
Fixed regression for W3 maps
Diffstat (limited to 'src')
| -rw-r--r-- | src/SFileCreateArchive.cpp | 9 | ||||
| -rw-r--r-- | src/StormLib.h | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/SFileCreateArchive.cpp b/src/SFileCreateArchive.cpp index 4266070..c0ea367 100644 --- a/src/SFileCreateArchive.cpp +++ b/src/SFileCreateArchive.cpp @@ -27,6 +27,13 @@ static const DWORD MpqHeaderSizes[] = //----------------------------------------------------------------------------- // Local functions +static DWORD GetValidFileFlags(DWORD dwMpqVersion) +{ + if(dwMpqVersion > MPQ_FORMAT_VERSION_1) + return MPQ_FILE_VALID_FLAGS; + return MPQ_FILE_VALID_FLAGS_W3X; +} + static USHORT GetSectorSizeShift(DWORD dwSectorSize) { USHORT wSectorSizeShift = 0; @@ -211,7 +218,7 @@ bool WINAPI SFileCreateArchive2(const TCHAR * szMpqName, PSFILE_CREATE_MPQ pCrea ha->dwMaxFileCount = dwHashTableSize; ha->dwFileTableSize = 0; ha->dwReservedFiles = dwReservedFiles; - ha->dwValidFileFlags = (pCreateInfo->dwMpqVersion > 1) ? MPQ_FILE_VALID_FLAGS : MPQ_FILE_VALID_FLAGS_W3X; + ha->dwValidFileFlags = GetValidFileFlags(pCreateInfo->dwMpqVersion); ha->dwFileFlags1 = pCreateInfo->dwFileFlags1; ha->dwFileFlags2 = pCreateInfo->dwFileFlags2; ha->dwFileFlags3 = pCreateInfo->dwFileFlags3 ? MPQ_FILE_EXISTS : 0; diff --git a/src/StormLib.h b/src/StormLib.h index dad9fc8..e45f99d 100644 --- a/src/StormLib.h +++ b/src/StormLib.h @@ -247,7 +247,6 @@ extern "C" { MPQ_FILE_COMPRESS | \ MPQ_FILE_ENCRYPTED | \ MPQ_FILE_FIX_KEY | \ - MPQ_FILE_SINGLE_UNIT | \ MPQ_FILE_DELETE_MARKER | \ MPQ_FILE_SECTOR_CRC | \ MPQ_FILE_SIGNATURE | \ |