Nopch/warning fixes
authorShauren <shauren.trinity@gmail.com>
Fri, 27 Apr 2018 18:29:01 +0000 (20:29 +0200)
committerShauren <shauren.trinity@gmail.com>
Fri, 27 Apr 2018 18:29:01 +0000 (20:29 +0200)
src/common/Collision/Management/VMapManager2.cpp
src/common/Collision/Maps/MapTree.cpp
src/common/Collision/Maps/MapTree.h
src/common/Collision/Maps/TileAssembler.cpp

index bf52acbe4c33feca7e29e19b7cd3f6da803437e2..163769f33a99ab4286000c031510f54aaaca1276 100644 (file)
@@ -132,7 +132,7 @@ namespace VMAP
         {
             std::string mapFileName = getMapFileName(mapId);
             StaticMapTree* newTree = new StaticMapTree(mapId, basePath);
-            if (!newTree->InitMap(mapFileName, this))
+            if (!newTree->InitMap(mapFileName))
             {
                 delete newTree;
                 return false;
index ce8ff8deb557b6f370866f2384639d75d3bf02a9..3ba9c860d6fbde8dbd4afa637ce5641f26e0a4b0 100644 (file)
@@ -266,8 +266,7 @@ namespace VMAP
         FILE* rf = fopen(fullname.c_str(), "rb");
         if (!rf)
             return false;
-        /// @todo check magic number when implemented...
-        char tiled;
+
         char chunk[8];
         if (!readChunk(rf, chunk, VMAP_MAGIC, 8))
         {
@@ -289,7 +288,7 @@ namespace VMAP
 
     //=========================================================
 
-    bool StaticMapTree::InitMap(const std::string &fname, VMapManager2* vm)
+    bool StaticMapTree::InitMap(std::string const& fname)
     {
         TC_LOG_DEBUG("maps", "StaticMapTree::InitMap() : initializing StaticMapTree '%s'", fname.c_str());
         bool success = false;
index 596a4ae0296aaeacf53737979d8f86cbd54ed63d..122f5dc63eba672b09145aa5286df57eb655082c 100644 (file)
@@ -82,7 +82,7 @@ namespace VMAP
             bool getAreaInfo(G3D::Vector3 &pos, uint32 &flags, int32 &adtId, int32 &rootId, int32 &groupId) const;
             bool GetLocationInfo(const G3D::Vector3 &pos, LocationInfo &info) const;
 
-            bool InitMap(const std::string &fname, VMapManager2* vm);
+            bool InitMap(std::string const& fname);
             void UnloadMap(VMapManager2* vm);
             bool LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm);
             void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm);
index 47dfadd09473bf3ab44d086d96a1b25eb3b876b5..ce94430b864a284ba5499d8f07f708e86a449178 100644 (file)
  */
 
 #include "TileAssembler.h"
-#include "MapTree.h"
 #include "BoundingIntervalHierarchy.h"
+#include "MapTree.h"
+#include "StringFormat.h"
 #include "VMapDefinitions.h"
-
-#include <set>
+#include <boost/filesystem.hpp>
 #include <iomanip>
+#include <set>
 #include <sstream>
-#include <boost/filesystem.hpp>
 
 using G3D::Vector3;
 using G3D::AABox;