From 0148cb8ad0e071464f09ada9eb41625dee038cb8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 9 Feb 2014 15:21:54 +0300
Subject: Remove loading maps from gzipped file.

This mode probably was used only in some very old clients.
---
 src/resources/mapreader.cpp | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

(limited to 'src/resources/mapreader.cpp')

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index bcafe4bb7..1e59b1673 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -190,7 +190,7 @@ Map *MapReader::readMap(const std::string &restrict filename,
     // Load the file through resource manager
     const ResourceManager *const resman = ResourceManager::getInstance();
     int fileSize;
-    void *buffer = resman->loadFile(realFilename, fileSize);
+    void *const buffer = resman->loadFile(realFilename, fileSize);
     Map *map = nullptr;
 
     if (!buffer)
@@ -199,33 +199,8 @@ Map *MapReader::readMap(const std::string &restrict filename,
         return createEmptyMap(filename, realFilename);
     }
 
-    unsigned char *inflated = nullptr;
-    unsigned int inflatedSize;
-
-    if (realFilename.find(".gz", realFilename.length() - 3)
-        != std::string::npos)
-    {
-        // Inflate the gzipped map data
-        inflatedSize = inflateMemory(static_cast<unsigned char*>(buffer),
-            fileSize, inflated);
-        free(buffer);
-
-        if (!inflated)
-        {
-            logger->log("Could not decompress map file (%s)",
-                        realFilename.c_str());
-            BLOCK_END("MapReader::readMap")
-            return nullptr;
-        }
-    }
-    else
-    {
-        inflated = static_cast<unsigned char*>(buffer);
-        inflatedSize = fileSize;
-    }
-
-    XML::Document doc(reinterpret_cast<char*>(inflated), inflatedSize);
-    free(inflated);
+    XML::Document doc(reinterpret_cast<const char*>(buffer), fileSize);
+    free(buffer);
 
     XmlNodePtrConst node = doc.rootNode();
 
-- 
cgit v1.2.3-60-g2f50