aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Management/MMapManager.cpp
diff options
context:
space:
mode:
authorVenugh <venugh@gmx.net>2012-04-09 18:05:35 +0200
committerVenugh <venugh@gmx.net>2012-04-09 18:05:35 +0200
commit8368112f453cc20672943dac533da1ee8ff933a3 (patch)
treefd340e3b4963f929bdee688247df8ea8b6de6ffb /src/server/collision/Management/MMapManager.cpp
parentb970d31e078d57def97a22e71499f779d6d080f6 (diff)
Try to check existance of mmaps folder.
Diffstat (limited to 'src/server/collision/Management/MMapManager.cpp')
-rw-r--r--src/server/collision/Management/MMapManager.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp
index aac5647a6de..449abcb967d 100644
--- a/src/server/collision/Management/MMapManager.cpp
+++ b/src/server/collision/Management/MMapManager.cpp
@@ -82,10 +82,10 @@ namespace MMAP
return uint32(x << 16 | y);
}
- bool MMapManager::loadMap(uint32 mapId, int32 x, int32 y)
+ bool MMapManager::loadMap(const std::string& basePath, uint32 mapId, int32 x, int32 y)
{
// make sure the mmap is loaded and ready to load tiles
- if(!loadMapData(mapId))
+ if (!loadMapData(mapId))
return false;
// get this mmap data
@@ -95,10 +95,7 @@ namespace MMAP
// check if we already have this tile loaded
uint32 packedGridPos = packTileID(x, y);
if (mmap->mmapLoadedTiles.find(packedGridPos) != mmap->mmapLoadedTiles.end())
- {
- //sLog->outError("MMAP:loadMap: Asked to load already loaded navmesh tile. %03u%02i%02i.mmtile", mapId, y, x);
return false;
- }
// load this tile :: mmaps/MMMXXYY.mmtile
uint32 pathLen = sWorld->GetDataPath().length() + strlen("mmaps/%03i%02i%02i.mmtile")+1;
@@ -136,7 +133,7 @@ namespace MMAP
ASSERT(data);
size_t result = fread(data, fileHeader.size, 1, file);
- if(!result)
+ if (!result)
{
sLog->outError("MMAP:loadMap: Bad header or data in mmap %03u%02i%02i.mmtile", mapId, y, x);
fclose(file);