Core/Revert: ...

4 files changed, 122 insertions, 108 deletions

diff --git a/src/server/collision/Management/MMapFactory.cpp b/src/server/collision/Management/MMapFactory.cpp
index 43c726d9989..b08cd92d638 100644
--- a/src/server/collision/Management/MMapFactory.cpp
+++ b/src/server/collision/Management/MMapFactory.cpp
@@ -25,14 +25,14 @@ namespace MMAP
 {
     // ######################## MMapFactory ########################
     // our global singleton copy
-    MMapManager* _manager = NULL;
+    MMapManager* g_MMapManager = NULL;
 
-    MMapManager* MMapFactory::CreateOrGetMMapManager()
+    MMapManager* MMapFactory::createOrGetMMapManager()
     {
-        if (_manager == NULL)
-            _manager = new MMapManager();
+        if (g_MMapManager == NULL)
+            g_MMapManager = new MMapManager();
 
-        return _manager;
+        return g_MMapManager;
     }
 
     bool MMapFactory::IsPathfindingEnabled(uint32 mapId)
@@ -41,12 +41,12 @@ namespace MMAP
             && !DisableMgr::IsDisabledFor(DISABLE_TYPE_MMAP, mapId, NULL, MMAP_DISABLE_PATHFINDING);
     }
 
-    void MMapFactory::Clear()
+    void MMapFactory::clear()
     {
-        if (_manager)
+        if (g_MMapManager)
         {
-            delete _manager;
-            _manager = NULL;
+            delete g_MMapManager;
+            g_MMapManager = NULL;
         }
     }
 }
\ No newline at end of file
diff --git a/src/server/collision/Management/MMapFactory.h b/src/server/collision/Management/MMapFactory.h
index 890befdff04..837c893f038 100644
--- a/src/server/collision/Management/MMapFactory.h
+++ b/src/server/collision/Management/MMapFactory.h
@@ -20,6 +20,10 @@
 #define _MMAP_FACTORY_H
 
 #include "MMapManager.h"
+#include "UnorderedMap.h"
+#include "DetourAlloc.h"
+#include "DetourNavMesh.h"
+#include "DetourNavMeshQuery.h"
 
 namespace MMAP
 {
@@ -36,8 +40,8 @@ namespace MMAP
     class MMapFactory
     {
         public:
-            static MMapManager* CreateOrGetMMapManager();
-            static void Clear();
+            static MMapManager* createOrGetMMapManager();
+            static void clear();
             static bool IsPathfindingEnabled(uint32 mapId);
     };
 }
diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp
index 6c6e39eeda2..cbb10923fe0 100644
--- a/src/server/collision/Management/MMapManager.cpp
+++ b/src/server/collision/Management/MMapManager.cpp
@@ -22,29 +22,32 @@
 
 namespace MMAP
 {
+    // ######################## MMapManager ########################
     MMapManager::~MMapManager()
     {
-        for (MMapDataSet::iterator i = _loadedMaps.begin(); i != _loadedMaps.end(); ++i)
+        for (MMapDataSet::iterator i = loadedMMaps.begin(); i != loadedMMaps.end(); ++i)
             delete i->second;
+
+        // by now we should not have maps loaded
+        // if we had, tiles in MMapData->mmapLoadedTiles, their actual data is lost!
     }
 
-    bool MMapManager::LoadMap(uint32 mapId)
+    bool MMapManager::loadMapData(uint32 mapId)
     {
-        // Do not load a map twice.
-        if (_loadedMaps.find(mapId) != _loadedMaps.end())
+        // we already have this map loaded?
+        if (loadedMMaps.find(mapId) != loadedMMaps.end())
             return true;
 
         // load and init dtNavMesh - read parameters from file
-        std::string basePath = sWorld->GetDataPath();
-        uint32 pathLen = basePath.length() + strlen("mmaps/%03i.mmap") + 1;
-        char* fileName = new char[pathLen];
-        snprintf(fileName, pathLen, (basePath + "mmaps/%03i.mmap").c_str(), mapId);
+        uint32 pathLen = sWorld->GetDataPath().length() + strlen("mmaps/%03i.mmap")+1;
+        char *fileName = new char[pathLen];
+        snprintf(fileName, pathLen, (sWorld->GetDataPath()+"mmaps/%03i.mmap").c_str(), mapId);
 
         FILE* file = fopen(fileName, "rb");
         if (!file)
         {
-            TC_LOG_DEBUG("maps", "MMAP::LoadMap: Error: Could not open mmap file '%s'", fileName);
-            delete[] fileName;
+            TC_LOG_DEBUG("maps", "MMAP:loadMapData: Error: Could not open mmap file '%s'", fileName);
+            delete [] fileName;
             return false;
         }
 
@@ -53,75 +56,80 @@ namespace MMAP
         fclose(file);
         if (count != 1)
         {
-            TC_LOG_DEBUG("maps", "MMAP::LoadMap: Error: Could not read params from file '%s'", fileName);
-            delete[] fileName;
+            TC_LOG_DEBUG("maps", "MMAP:loadMapData: Error: Could not read params from file '%s'", fileName);
+            delete [] fileName;
             return false;
         }
 
         dtNavMesh* mesh = dtAllocNavMesh();
+        ASSERT(mesh);
         if (dtStatusFailed(mesh->init(&params)))
         {
             dtFreeNavMesh(mesh);
-            TC_LOG_ERROR("maps", "MMAP::LoadMap: Failed to initialize dtNavMesh for mmap %03u from file %s", mapId, fileName);
-            delete[] fileName;
+            TC_LOG_ERROR("maps", "MMAP:loadMapData: Failed to initialize dtNavMesh for mmap %03u from file %s", mapId, fileName);
+            delete [] fileName;
             return false;
         }
 
-        delete[] fileName;
+        delete [] fileName;
 
-        TC_LOG_INFO("maps", "MMAP::LoadMap: Loaded %03i.mmap", mapId);
+        TC_LOG_INFO("maps", "MMAP:loadMapData: Loaded %03i.mmap", mapId);
 
         // store inside our map list
-        MMapData* mmapData = new MMapData(mesh);
-        mmapData->_loadedTiles.clear();
+        MMapData* mmap_data = new MMapData(mesh);
+        mmap_data->mmapLoadedTiles.clear();
 
-        _loadedMaps.insert(std::pair<uint32, MMapData*>(mapId, mmapData));
+        loadedMMaps.insert(std::pair<uint32, MMapData*>(mapId, mmap_data));
         return true;
     }
 
-    bool MMapManager::LoadMapTile(uint32 mapId, int32 x, int32 y)
+    uint32 MMapManager::packTileID(int32 x, int32 y)
+    {
+        return uint32(x << 16 | 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 (!LoadMap(mapId))
+        if (!loadMapData(mapId))
             return false;
 
         // get this mmap data
-        MMapData* mmap = _loadedMaps[mapId];
+        MMapData* mmap = loadedMMaps[mapId];
         ASSERT(mmap->navMesh);
 
-        // Check if we already have this tile loaded
-        uint32 pos = PackTileId(x, y);
-        if (mmap->_loadedTiles.find(pos) != mmap->_loadedTiles.end())
+        // check if we already have this tile loaded
+        uint32 packedGridPos = packTileID(x, y);
+        if (mmap->mmapLoadedTiles.find(packedGridPos) != mmap->mmapLoadedTiles.end())
             return false;
 
-        std::string basePath = sWorld->GetDataPath();
-        uint32 pathLen = basePath.length() + strlen("mmaps/%03i%02i%02i.mmtile") + 1;
-        char* fileName = new char[pathLen];
+        // load this tile :: mmaps/MMMXXYY.mmtile
+        uint32 pathLen = sWorld->GetDataPath().length() + strlen("mmaps/%03i%02i%02i.mmtile")+1;
+        char *fileName = new char[pathLen];
 
-        snprintf(fileName, pathLen, (basePath + "mmaps/%03i%02i%02i.mmtile").c_str(), mapId, x, y);
+        snprintf(fileName, pathLen, (sWorld->GetDataPath()+"mmaps/%03i%02i%02i.mmtile").c_str(), mapId, x, y);
 
         FILE* file = fopen(fileName, "rb");
         if (!file)
         {
-            TC_LOG_DEBUG("maps", "MMAP::LoadMapTile: Could not open mmtile file '%s'", fileName);
-            delete[] fileName;
+            TC_LOG_DEBUG("maps", "MMAP:loadMap: Could not open mmtile file '%s'", fileName);
+            delete [] fileName;
             return false;
         }
-
-        delete[] fileName;
+        delete [] fileName;
 
         // read header
         MmapTileHeader fileHeader;
         if (fread(&fileHeader, sizeof(MmapTileHeader), 1, file) != 1 || fileHeader.mmapMagic != MMAP_MAGIC)
         {
-            TC_LOG_ERROR("maps", "MMAP::LoadMapTile: Bad header in mmap %03u%02i%02i.mmtile", mapId, x, y);
+            TC_LOG_ERROR("maps", "MMAP:loadMap: Bad header in mmap %03u%02i%02i.mmtile", mapId, x, y);
             fclose(file);
             return false;
         }
 
         if (fileHeader.mmapVersion != MMAP_VERSION)
         {
-            TC_LOG_ERROR("maps", "MMAP::LoadMapTile: %03u%02i%02i.mmtile was built with generator v%i, expected v%i",
+            TC_LOG_ERROR("maps", "MMAP:loadMap: %03u%02i%02i.mmtile was built with generator v%i, expected v%i",
                 mapId, x, y, fileHeader.mmapVersion, MMAP_VERSION);
             fclose(file);
             return false;
@@ -131,9 +139,9 @@ namespace MMAP
         ASSERT(data);
 
         size_t result = fread(data, fileHeader.size, 1, file);
-        if (result != 1)
+        if (!result)
         {
-            TC_LOG_ERROR("maps", "MMAP::LoadMapTile: Bad header or data in mmap %03u%02i%02i.mmtile", mapId, x, y);
+            TC_LOG_ERROR("maps", "MMAP:loadMap: Bad header or data in mmap %03u%02i%02i.mmtile", mapId, x, y);
             fclose(file);
             return false;
         }
@@ -146,14 +154,14 @@ namespace MMAP
         // memory allocated for data is now managed by detour, and will be deallocated when the tile is removed
         if (dtStatusSucceed(mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef)))
         {
-            mmap->_loadedTiles.insert(std::pair<uint32, dtTileRef>(pos, tileRef));
-            ++_loadedTiles;
-            TC_LOG_INFO("maps", "MMAP::LoadMapTile: Loaded mmtile %03i[%02i, %02i] into %03i[%02i, %02i]", mapId, x, y, mapId, header->x, header->y);
+            mmap->mmapLoadedTiles.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef));
+            ++loadedTiles;
+            TC_LOG_INFO("maps", "MMAP:loadMap: Loaded mmtile %03i[%02i, %02i] into %03i[%02i, %02i]", mapId, x, y, mapId, header->x, header->y);
             return true;
         }
         else
         {
-            TC_LOG_ERROR("maps", "MMAP::LoadMapTile: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y);
+            TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y);
             dtFree(data);
             return false;
         }
@@ -161,26 +169,28 @@ namespace MMAP
         return false;
     }
 
-    bool MMapManager::UnloadMapTile(uint32 mapId, int32 x, int32 y)
+    bool MMapManager::unloadMap(uint32 mapId, int32 x, int32 y)
     {
-        // Do not attempt to remove tiles from a not-loaded map
-        if (_loadedMaps.find(mapId) == _loadedMaps.end())
+        // check if we have this map loaded
+        if (loadedMMaps.find(mapId) == loadedMMaps.end())
         {
-            TC_LOG_DEBUG("maps", "MMAP::UnloadMapTile: Asked to unload not loaded navmesh map. %03u%02i%02i.mmtile", mapId, x, y);
+            // file may not exist, therefore not loaded
+            TC_LOG_DEBUG("maps", "MMAP:unloadMap: Asked to unload not loaded navmesh map. %03u%02i%02i.mmtile", mapId, x, y);
             return false;
         }
 
-        MMapData* mmap = _loadedMaps[mapId];
+        MMapData* mmap = loadedMMaps[mapId];
 
         // check if we have this tile loaded
-        uint32 pos = PackTileId(x, y);
-        if (mmap->_loadedTiles.find(pos) == mmap->_loadedTiles.end())
+        uint32 packedGridPos = packTileID(x, y);
+        if (mmap->mmapLoadedTiles.find(packedGridPos) == mmap->mmapLoadedTiles.end())
         {
-            TC_LOG_DEBUG("maps", "MMAP::UnloadMapTile: Asked to unload not loaded navmesh tile. %03u%02i%02i.mmtile", mapId, x, y);
+            // file may not exist, therefore not loaded
+            TC_LOG_DEBUG("maps", "MMAP:unloadMap: Asked to unload not loaded navmesh tile. %03u%02i%02i.mmtile", mapId, x, y);
             return false;
         }
 
-        dtTileRef tileRef = mmap->_loadedTiles[pos];
+        dtTileRef tileRef = mmap->mmapLoadedTiles[packedGridPos];
 
         // unload, and mark as non loaded
         if (dtStatusFailed(mmap->navMesh->removeTile(tileRef, NULL, NULL)))
@@ -188,106 +198,107 @@ namespace MMAP
             // this is technically a memory leak
             // if the grid is later reloaded, dtNavMesh::addTile will return error but no extra memory is used
             // we cannot recover from this error - assert out
-            TC_LOG_ERROR("maps", "MMAP::UnloadMapTile: Could not unload %03u%02i%02i.mmtile from navmesh", mapId, x, y);
+            TC_LOG_ERROR("maps", "MMAP:unloadMap: Could not unload %03u%02i%02i.mmtile from navmesh", mapId, x, y);
             ASSERT(false);
         }
         else
         {
-            mmap->_loadedTiles.erase(pos);
-            --_loadedTiles;
-            TC_LOG_INFO("maps", "MMAP::UnloadMapTile: Unloaded mmtile [%02i, %02i] from %03i", x, y, mapId);
+            mmap->mmapLoadedTiles.erase(packedGridPos);
+            --loadedTiles;
+            TC_LOG_INFO("maps", "MMAP:unloadMap: Unloaded mmtile %03i[%02i, %02i] from %03i", mapId, x, y, mapId);
             return true;
         }
 
         return false;
     }
 
-    bool MMapManager::UnloadMap(uint32 mapId)
+    bool MMapManager::unloadMap(uint32 mapId)
     {
-        if (_loadedMaps.find(mapId) == _loadedMaps.end())
+        if (loadedMMaps.find(mapId) == loadedMMaps.end())
         {
             // file may not exist, therefore not loaded
-            TC_LOG_DEBUG("maps", "MMAP::UnloadMap: Asked to unload not loaded navmesh map %03u", mapId);
+            TC_LOG_DEBUG("maps", "MMAP:unloadMap: Asked to unload not loaded navmesh map %03u", mapId);
             return false;
         }
 
         // unload all tiles from given map
-        MMapData* mmap = _loadedMaps[mapId];
-        for (MMapTileSet::iterator i = mmap->_loadedTiles.begin(); i != mmap->_loadedTiles.end(); ++i)
+        MMapData* mmap = loadedMMaps[mapId];
+        for (MMapTileSet::iterator i = mmap->mmapLoadedTiles.begin(); i != mmap->mmapLoadedTiles.end(); ++i)
         {
             uint32 x = (i->first >> 16);
             uint32 y = (i->first & 0x0000FFFF);
             if (dtStatusFailed(mmap->navMesh->removeTile(i->second, NULL, NULL)))
-                TC_LOG_ERROR("maps", "MMAP::UnloadMap: Could not unload %03u%02u%02u.mmtile from navmesh", mapId, x, y);
+                TC_LOG_ERROR("maps", "MMAP:unloadMap: Could not unload %03u%02i%02i.mmtile from navmesh", mapId, x, y);
             else
             {
-                --_loadedTiles;
-                TC_LOG_INFO("maps", "MMAP::UnloadMap: Unloaded mmtile [%02u, %02u] from %03u", x, y, mapId);
+                --loadedTiles;
+                TC_LOG_INFO("maps", "MMAP:unloadMap: Unloaded mmtile %03i[%02i, %02i] from %03i", mapId, x, y, mapId);
             }
         }
 
         delete mmap;
-        _loadedMaps.erase(mapId);
-        TC_LOG_INFO("maps", "MMAP::UnloadMap: Unloaded %03u.mmap", mapId);
+        loadedMMaps.erase(mapId);
+        TC_LOG_INFO("maps", "MMAP:unloadMap: Unloaded %03i.mmap", mapId);
 
         return true;
     }
 
-    bool MMapManager::UnloadMapInstance(uint32 mapId, uint32 instanceId)
+    bool MMapManager::unloadMapInstance(uint32 mapId, uint32 instanceId)
     {
         // check if we have this map loaded
-        if (_loadedMaps.find(mapId) == _loadedMaps.end())
+        if (loadedMMaps.find(mapId) == loadedMMaps.end())
         {
             // file may not exist, therefore not loaded
-            TC_LOG_DEBUG("maps", "MMAP::UnloadMapInstance: Asked to unload not loaded navmesh map %03u", mapId);
+            TC_LOG_DEBUG("maps", "MMAP:unloadMapInstance: Asked to unload not loaded navmesh map %03u", mapId);
             return false;
         }
 
-        MMapData* mmap = _loadedMaps[mapId];
-        if (mmap->_navMeshQueries.find(instanceId) == mmap->_navMeshQueries.end())
+        MMapData* mmap = loadedMMaps[mapId];
+        if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end())
         {
-            TC_LOG_DEBUG("maps", "MMAP::UnloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId %03u instanceId %u", mapId, instanceId);
+            TC_LOG_DEBUG("maps", "MMAP:unloadMapInstance: Asked to unload not loaded dtNavMeshQuery mapId %03u instanceId %u", mapId, instanceId);
             return false;
         }
 
-        dtNavMeshQuery* query = mmap->_navMeshQueries[instanceId];
+        dtNavMeshQuery* query = mmap->navMeshQueries[instanceId];
 
         dtFreeNavMeshQuery(query);
-        mmap->_navMeshQueries.erase(instanceId);
-        TC_LOG_INFO("maps", "MMAP::UnloadMapInstance: Unloaded mapId %03u instanceId %u", mapId, instanceId);
+        mmap->navMeshQueries.erase(instanceId);
+        TC_LOG_INFO("maps", "MMAP:unloadMapInstance: Unloaded mapId %03u instanceId %u", mapId, instanceId);
 
         return true;
     }
 
     dtNavMesh const* MMapManager::GetNavMesh(uint32 mapId)
     {
-        if (_loadedMaps.find(mapId) == _loadedMaps.end())
+        if (loadedMMaps.find(mapId) == loadedMMaps.end())
             return NULL;
 
-        return _loadedMaps[mapId]->navMesh;
+        return loadedMMaps[mapId]->navMesh;
     }
 
     dtNavMeshQuery const* MMapManager::GetNavMeshQuery(uint32 mapId, uint32 instanceId)
     {
-        if (_loadedMaps.find(mapId) == _loadedMaps.end())
+        if (loadedMMaps.find(mapId) == loadedMMaps.end())
             return NULL;
 
-        MMapData* mmap = _loadedMaps[mapId];
-        if (mmap->_navMeshQueries.find(instanceId) == mmap->_navMeshQueries.end())
+        MMapData* mmap = loadedMMaps[mapId];
+        if (mmap->navMeshQueries.find(instanceId) == mmap->navMeshQueries.end())
         {
             // allocate mesh query
             dtNavMeshQuery* query = dtAllocNavMeshQuery();
-            if (dtStatusFailed(query->init(mmap->navMesh, 2048)))
+            ASSERT(query);
+            if (dtStatusFailed(query->init(mmap->navMesh, 1024)))
             {
                 dtFreeNavMeshQuery(query);
-                TC_LOG_ERROR("maps", "MMAP::GetNavMeshQuery: Failed to initialize dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
+                TC_LOG_ERROR("maps", "MMAP:GetNavMeshQuery: Failed to initialize dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
                 return NULL;
             }
 
             TC_LOG_INFO("maps", "MMAP:GetNavMeshQuery: created dtNavMeshQuery for mapId %03u instanceId %u", mapId, instanceId);
-            mmap->_navMeshQueries.insert(std::pair<uint32, dtNavMeshQuery*>(instanceId, query));
+            mmap->navMeshQueries.insert(std::pair<uint32, dtNavMeshQuery*>(instanceId, query));
         }
 
-        return mmap->_navMeshQueries[instanceId];
+        return mmap->navMeshQueries[instanceId];
     }
 }
diff --git a/src/server/collision/Management/MMapManager.h b/src/server/collision/Management/MMapManager.h
index 87bb4702dd2..8b0d42b83cd 100644
--- a/src/server/collision/Management/MMapManager.h
+++ b/src/server/collision/Management/MMapManager.h
@@ -36,7 +36,7 @@ namespace MMAP
         MMapData(dtNavMesh* mesh) : navMesh(mesh) { }
         ~MMapData()
         {
-            for (NavMeshQuerySet::iterator i = _navMeshQueries.begin(); i != _navMeshQueries.end(); ++i)
+            for (NavMeshQuerySet::iterator i = navMeshQueries.begin(); i != navMeshQueries.end(); ++i)
                 dtFreeNavMeshQuery(i->second);
 
             if (navMesh)
@@ -46,8 +46,8 @@ namespace MMAP
         dtNavMesh* navMesh;
 
         // we have to use single dtNavMeshQuery for every instance, since those are not thread safe
-        NavMeshQuerySet _navMeshQueries;     // instanceId to query
-        MMapTileSet _loadedTiles;        // maps [map grid coords] to [dtTile]
+        NavMeshQuerySet navMeshQueries;     // instanceId to query
+        MMapTileSet mmapLoadedTiles;        // maps [map grid coords] to [dtTile]
     };
 
 
@@ -58,27 +58,26 @@ namespace MMAP
     class MMapManager
     {
         public:
-            MMapManager() : _loadedTiles(0) {}
-
+            MMapManager() : loadedTiles(0) { }
             ~MMapManager();
 
-            bool LoadMapTile(uint32 mapId, int32 x, int32 y);
-            bool UnloadMapTile(uint32 mapId, int32 x, int32 y);
-            bool UnloadMap(uint32 mapId);
-            bool UnloadMapInstance(uint32 mapId, uint32 instanceId);
+            bool loadMap(const std::string& basePath, uint32 mapId, int32 x, int32 y);
+            bool unloadMap(uint32 mapId, int32 x, int32 y);
+            bool unloadMap(uint32 mapId);
+            bool unloadMapInstance(uint32 mapId, uint32 instanceId);
 
             // the returned [dtNavMeshQuery const*] is NOT threadsafe
             dtNavMeshQuery const* GetNavMeshQuery(uint32 mapId, uint32 instanceId);
             dtNavMesh const* GetNavMesh(uint32 mapId);
 
-            uint32 GetLoadedTilesCount() const { return _loadedTiles; }
-            uint32 GetLoadedMapsCount() const { return _loadedMaps.size(); }
+            uint32 getLoadedTilesCount() const { return loadedTiles; }
+            uint32 getLoadedMapsCount() const { return loadedMMaps.size(); }
         private:
-            bool LoadMap(uint32 mapId);
-            uint32 PackTileId(int32 x, int32 y) { return uint32(x << 16 | y); }
+            bool loadMapData(uint32 mapId);
+            uint32 packTileID(int32 x, int32 y);
 
-            MMapDataSet _loadedMaps;
-            uint32 _loadedTiles;
+            MMapDataSet loadedMMaps;
+            uint32 loadedTiles;
     };
 }