diff options
| -rw-r--r-- | src/SBaseFileTable.cpp | 4 | ||||
| -rw-r--r-- | src/SFileOpenArchive.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp index aba5e2c..3d74fb1 100644 --- a/src/SBaseFileTable.cpp +++ b/src/SBaseFileTable.cpp @@ -448,7 +448,9 @@ int ConvertMpqHeaderToFormat4( // Reason: Storm.dll in Warcraft III ignores format version value
if((MapType == MapTypeWarcraft3) || (dwFlags & MPQ_OPEN_FORCE_MPQ_V1))
wFormatVersion = MPQ_FORMAT_VERSION_1;
- if((MapType == MapTypeStarcraft2) && (pHeader->wFormatVersion > MPQ_FORMAT_VERSION_4))
+
+ // Don't accept format 3 for Starcraft II maps
+ if((MapType == MapTypeStarcraft2) && (pHeader->wFormatVersion > MPQ_FORMAT_VERSION_2))
wFormatVersion = MPQ_FORMAT_VERSION_4;
// Format-specific fixes
diff --git a/src/SFileOpenArchive.cpp b/src/SFileOpenArchive.cpp index 1d2c2f9..e8ef64a 100644 --- a/src/SFileOpenArchive.cpp +++ b/src/SFileOpenArchive.cpp @@ -147,7 +147,7 @@ static int VerifyMpqTablePositions(TMPQArchive * ha, ULONGLONG FileSize) } //----------------------------------------------------------------------------- -// Support for alternate markers. Call before SFileOpenArchive +// Support for alternate markers. Call before opening an archive #define SFILE_MARKERS_MIN_SIZE (sizeof(DWORD) + sizeof(DWORD) + sizeof(const char *) + sizeof(const char *)) |