diff options
Diffstat (limited to 'src/server/game/Pools/PoolMgr.h')
| -rw-r--r-- | src/server/game/Pools/PoolMgr.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h index dd24cceae07..ff633c08ba1 100644 --- a/src/server/game/Pools/PoolMgr.h +++ b/src/server/game/Pools/PoolMgr.h @@ -31,31 +31,31 @@ struct PoolTemplateData struct PoolObject { - uint32 guid; + uint64 guid; float chance; - PoolObject(uint32 _guid, float _chance) : guid(_guid), chance(std::fabs(_chance)) { } + PoolObject(uint64 _guid, float _chance) : guid(_guid), chance(std::fabs(_chance)) { } }; class Pool // for Pool of Pool case { }; -typedef std::set<uint32> ActivePoolObjects; -typedef std::map<uint32, uint32> ActivePoolPools; +typedef std::set<uint64> ActivePoolObjects; +typedef std::map<uint64, uint32> ActivePoolPools; class ActivePoolData { public: template<typename T> - bool IsActiveObject(uint32 db_guid_or_pool_id) const; + bool IsActiveObject(uint64 db_guid_or_pool_id) const; uint32 GetActiveObjectCount(uint32 pool_id) const; template<typename T> - void ActivateObject(uint32 db_guid_or_pool_id, uint32 pool_id); + void ActivateObject(uint64 db_guid_or_pool_id, uint32 pool_id); template<typename T> - void RemoveObject(uint32 db_guid_or_pool_id, uint32 pool_id); + void RemoveObject(uint64 db_guid_or_pool_id, uint32 pool_id); ActivePoolObjects GetActiveQuests() const { return mActiveQuests; } // a copy of the set private: @@ -76,15 +76,15 @@ class PoolGroup bool isEmpty() const { return ExplicitlyChanced.empty() && EqualChanced.empty(); } void AddEntry(PoolObject& poolitem, uint32 maxentries); bool CheckPool() const; - PoolObject* RollOne(ActivePoolData& spawns, uint32 triggerFrom); - void DespawnObject(ActivePoolData& spawns, uint32 guid=0); - void Despawn1Object(uint32 guid); - void SpawnObject(ActivePoolData& spawns, uint32 limit, uint32 triggerFrom); + PoolObject* RollOne(ActivePoolData& spawns, uint64 triggerFrom); + void DespawnObject(ActivePoolData& spawns, uint64 guid=0); + void Despawn1Object(uint64 guid); + void SpawnObject(ActivePoolData& spawns, uint32 limit, uint64 triggerFrom); void Spawn1Object(PoolObject* obj); void ReSpawn1Object(PoolObject* obj); void RemoveOneRelation(uint32 child_pool_id); - uint32 GetFirstEqualChancedObjectId() + uint64 GetFirstEqualChancedObjectId() { if (EqualChanced.empty()) return 0; @@ -121,10 +121,10 @@ class PoolMgr void Initialize(); template<typename T> - uint32 IsPartOfAPool(uint32 db_guid_or_pool_id) const; + uint32 IsPartOfAPool(uint64 db_guid_or_pool_id) const; template<typename T> - bool IsSpawnedObject(uint32 db_guid_or_pool_id) const { return mSpawnedData.IsActiveObject<T>(db_guid_or_pool_id); } + bool IsSpawnedObject(uint64 db_guid_or_pool_id) const { return mSpawnedData.IsActiveObject<T>(db_guid_or_pool_id); } bool CheckPool(uint32 pool_id) const; @@ -132,7 +132,7 @@ class PoolMgr void DespawnPool(uint32 pool_id); template<typename T> - void UpdatePool(uint32 pool_id, uint32 db_guid_or_pool_id); + void UpdatePool(uint32 pool_id, uint64 db_guid_or_pool_id); void ChangeDailyQuests(); void ChangeWeeklyQuests(); @@ -142,7 +142,7 @@ class PoolMgr private: template<typename T> - void SpawnPool(uint32 pool_id, uint32 db_guid_or_pool_id); + void SpawnPool(uint32 pool_id, uint64 db_guid_or_pool_id); uint32 max_pool_id; typedef std::vector<PoolTemplateData> PoolTemplateDataMap; @@ -150,8 +150,8 @@ class PoolMgr typedef std::vector<PoolGroup<GameObject> > PoolGroupGameObjectMap; typedef std::vector<PoolGroup<Pool> > PoolGroupPoolMap; typedef std::vector<PoolGroup<Quest> > PoolGroupQuestMap; - typedef std::pair<uint32, uint32> SearchPair; - typedef std::map<uint32, uint32> SearchMap; + typedef std::pair<uint64, uint32> SearchPair; + typedef std::map<uint64, uint32> SearchMap; PoolTemplateDataMap mPoolTemplate; PoolGroupCreatureMap mPoolCreatureGroups; @@ -171,7 +171,7 @@ class PoolMgr // Method that tell if the creature is part of a pool and return the pool id if yes template<> -inline uint32 PoolMgr::IsPartOfAPool<Creature>(uint32 db_guid) const +inline uint32 PoolMgr::IsPartOfAPool<Creature>(uint64 db_guid) const { SearchMap::const_iterator itr = mCreatureSearchMap.find(db_guid); if (itr != mCreatureSearchMap.end()) @@ -182,7 +182,7 @@ inline uint32 PoolMgr::IsPartOfAPool<Creature>(uint32 db_guid) const // Method that tell if the gameobject is part of a pool and return the pool id if yes template<> -inline uint32 PoolMgr::IsPartOfAPool<GameObject>(uint32 db_guid) const +inline uint32 PoolMgr::IsPartOfAPool<GameObject>(uint64 db_guid) const { SearchMap::const_iterator itr = mGameobjectSearchMap.find(db_guid); if (itr != mGameobjectSearchMap.end()) @@ -193,7 +193,7 @@ inline uint32 PoolMgr::IsPartOfAPool<GameObject>(uint32 db_guid) const // Method that tell if the quest is part of another pool and return the pool id if yes template<> -inline uint32 PoolMgr::IsPartOfAPool<Quest>(uint32 pool_id) const +inline uint32 PoolMgr::IsPartOfAPool<Quest>(uint64 pool_id) const { SearchMap::const_iterator itr = mQuestSearchMap.find(pool_id); if (itr != mQuestSearchMap.end()) @@ -204,7 +204,7 @@ inline uint32 PoolMgr::IsPartOfAPool<Quest>(uint32 pool_id) const // Method that tell if the pool is part of another pool and return the pool id if yes template<> -inline uint32 PoolMgr::IsPartOfAPool<Pool>(uint32 pool_id) const +inline uint32 PoolMgr::IsPartOfAPool<Pool>(uint64 pool_id) const { SearchMap::const_iterator itr = mPoolSearchMap.find(pool_id); if (itr != mPoolSearchMap.end()) |