From 3dd8d1198c46c42a47cd6089e9dd99b9dfdaa798 Mon Sep 17 00:00:00 2001
From: Ladislav <Zezula>
Date: Sun, 22 Dec 2013 12:47:26 +0100
Subject: + MPQ Bitmap processign was moved to TFileStream + Preparing for
 implementation of master-mirror streaming (like Blizzard games do)

---
 src/SFileOpenArchive.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/SFileOpenArchive.cpp')

diff --git a/src/SFileOpenArchive.cpp b/src/SFileOpenArchive.cpp
index e5dcf03..9970791 100644
--- a/src/SFileOpenArchive.cpp
+++ b/src/SFileOpenArchive.cpp
@@ -161,8 +161,13 @@ bool WINAPI SFileOpenArchive(
     // Open the MPQ archive file
     if(nError == ERROR_SUCCESS)
     {
+        DWORD dwStreamFlags = (dwFlags & STREAM_FLAGS_MASK);
+
+        // If not forcing MPQ v 1.0, also use file bitmap
+        dwStreamFlags |= (dwFlags & MPQ_OPEN_FORCE_MPQ_V1) ? 0 : STREAM_FLAG_USE_BITMAP;
+
         // Initialize the stream
-        pStream = FileStream_OpenFile(szMpqName, (dwFlags & STREAM_OPTIONS_MASK) | STREAM_FLAG_USE_BITMAP);
+        pStream = FileStream_OpenFile(szMpqName, dwStreamFlags);
         if(pStream == NULL)
             nError = GetLastError();
     }
-- 
cgit v1.2.3