diff options
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index a6e2ce9b067..46561fd7773 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -35,7 +35,6 @@ #include "Map.h" #include "ObjectAccessor.h" #include "ObjectDefines.h" -#include <ace/Singleton.h> #include "VehicleDefines.h" #include <string> #include <map> @@ -723,13 +722,18 @@ class PlayerDumpReader; class ObjectMgr { friend class PlayerDumpReader; - friend class ACE_Singleton<ObjectMgr, ACE_Null_Mutex>; private: ObjectMgr(); ~ObjectMgr(); public: + static ObjectMgr* instance() + { + static ObjectMgr* instance = new ObjectMgr(); + return instance; + } + typedef std::unordered_map<uint32, Item*> ItemMap; typedef std::unordered_map<uint32, Quest*> QuestMap; @@ -1326,7 +1330,7 @@ class ObjectMgr void LoadFactionChangeSpells(); void LoadFactionChangeTitles(); - bool IsTransportMap(uint32 mapId) const { return _transportMaps.count(mapId); } + bool IsTransportMap(uint32 mapId) const { return _transportMaps.count(mapId) != 0; } void LoadHotfixData(); HotfixData const& GetHotfixData() const { return _hotfixData; } @@ -1494,6 +1498,6 @@ class ObjectMgr std::set<uint32> _transportMaps; // Helper container storing map ids that are for transports only, loaded from gameobject_template }; -#define sObjectMgr ACE_Singleton<ObjectMgr, ACE_Null_Mutex>::instance() +#define sObjectMgr ObjectMgr::instance() #endif |