diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Collision/Management/VMapManager2.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Maps/MapTree.cpp | 5 | ||||
| -rw-r--r-- | src/common/Collision/Maps/MapTree.h | 2 | ||||
| -rw-r--r-- | src/common/Collision/Maps/TileAssembler.cpp | 8 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index bf52acbe4c3..163769f33a9 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -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; diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index ce8ff8deb55..3ba9c860d6f 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -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; diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index 596a4ae0296..122f5dc63eb 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -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); diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 47dfadd0947..ce94430b864 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -17,14 +17,14 @@ */ #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; |