diff options
Diffstat (limited to 'src/server/game/Maps/MapManager.h')
| -rw-r--r-- | src/server/game/Maps/MapManager.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index b7fb0617a46..990d5e80c1a 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -24,18 +24,18 @@ #include "GridStates.h" #include "MapUpdater.h" -#include <ace/Singleton.h> -#include <ace/Thread_Mutex.h> - - class Transport; struct TransportCreatureProto; class MapManager { - friend class ACE_Singleton<MapManager, ACE_Thread_Mutex>; - public: + static MapManager* instance() + { + static MapManager* instance = new MapManager(); + return instance; + } + Map* CreateBaseMap(uint32 mapId); Map* FindBaseNonInstanceMap(uint32 mapId) const; Map* CreateMap(uint32 mapId, Player* player); @@ -141,7 +141,7 @@ class MapManager MapManager(const MapManager &); MapManager& operator=(const MapManager &); - ACE_Thread_Mutex Lock; + std::mutex _mapsLock; uint32 i_gridCleanUpDelay; MapMapType i_maps; IntervalTimer i_timer; @@ -150,5 +150,5 @@ class MapManager uint32 _nextInstanceId; MapUpdater m_updater; }; -#define sMapMgr ACE_Singleton<MapManager, ACE_Thread_Mutex>::instance() +#define sMapMgr MapManager::instance() #endif |