diff options
| author | Zezula Ladislav <ladislav.zezula@avast.com> | 2017-07-28 10:43:49 +0200 |
|---|---|---|
| committer | Zezula Ladislav <ladislav.zezula@avast.com> | 2017-07-28 10:43:49 +0200 |
| commit | 80021e4a6704d1854a37aa183c62323ff1cf9011 (patch) | |
| tree | 187c977feeef0849e97b56d2a4a56d37a3da6b6c /src/SBaseFileTable.cpp | |
| parent | f813753a661731f970f0522597c228738bf8d075 (diff) | |
+ Fixed bug when SFileAddFileEx could add a file with MPQ_FILE_SINGLE_UNIT to a Warcraft III map
Diffstat (limited to 'src/SBaseFileTable.cpp')
| -rw-r--r-- | src/SBaseFileTable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp index d9664a5..39ba125 100644 --- a/src/SBaseFileTable.cpp +++ b/src/SBaseFileTable.cpp @@ -351,7 +351,7 @@ int ConvertMpqHeaderToFormat4( // If version 1.0 is forced, then the format version is forced to be 1.0
// Reason: Storm.dll in Warcraft III ignores format version value
- if((dwFlags & MPQ_OPEN_FORCE_MPQ_V1) || (bIsWarcraft3Map))
+ if((dwFlags & MPQ_OPEN_FORCE_MPQ_V1) || bIsWarcraft3Map)
wFormatVersion = MPQ_FORMAT_VERSION_1;
// Format-specific fixes
@@ -752,7 +752,7 @@ static int BuildFileTableFromBlockTable( assert(ha->dwFileTableSize >= ha->dwMaxFileCount);
// MPQs for Warcraft III doesn't know some flags, namely MPQ_FILE_SINGLE_UNIT and MPQ_FILE_PATCH_FILE
- dwFlagMask = (ha->dwFlags & MPQ_FLAG_WAR3_MAP) ? ~(MPQ_FILE_SINGLE_UNIT | MPQ_FILE_PATCH_FILE) : 0xFFFFFFFF;
+ dwFlagMask = (ha->dwFlags & MPQ_FLAG_WAR3_MAP) ? MPQ_FILE_VALID_FLAGS_W3X : MPQ_FILE_VALID_FLAGS;
// Defragment the hash table, if needed
if(ha->dwFlags & MPQ_FLAG_HASH_TABLE_CUT)
|