Core: Minor cleanup in ObjectMgr and warning fixes
This commit is contained in:
@@ -385,7 +385,6 @@ struct TrinityStringLocale
|
||||
StringVector Content;
|
||||
};
|
||||
|
||||
|
||||
typedef std::map<uint64, uint64> LinkedRespawnContainer;
|
||||
typedef UNORDERED_MAP<uint32, CreatureData> CreatureDataContainer;
|
||||
typedef UNORDERED_MAP<uint32, GameObjectData> GameObjectDataContainer;
|
||||
@@ -527,6 +526,7 @@ struct GraveYardData
|
||||
uint32 safeLocId;
|
||||
uint32 team;
|
||||
};
|
||||
|
||||
typedef std::multimap<uint32, GraveYardData> GraveYardContainer;
|
||||
|
||||
typedef UNORDERED_MAP<uint32, VendorItemData> CacheVendorItemContainer;
|
||||
@@ -641,7 +641,7 @@ class ObjectMgr
|
||||
return NULL;
|
||||
}
|
||||
|
||||
InstanceTemplate const* GetInstanceTemplate(uint32 mapID);
|
||||
InstanceTemplate const* GetInstanceTemplate(uint32 mapId);
|
||||
|
||||
PetLevelInfo const* GetPetLevelInfo(uint32 creature_id, uint8 level) const;
|
||||
|
||||
@@ -1334,7 +1334,6 @@ class ObjectMgr
|
||||
GO_TO_GO,
|
||||
GO_TO_CREATURE, // GO is dependant on creature
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
#define sObjectMgr ACE_Singleton<ObjectMgr, ACE_Null_Mutex>::instance()
|
||||
|
||||
Reference in New Issue
Block a user