diff options
Diffstat (limited to 'src/server/game/Maps/Map.h')
| -rw-r--r-- | src/server/game/Maps/Map.h | 102 |
1 files changed, 53 insertions, 49 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 96965b61fd2..64bef6ed2ea 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -501,7 +501,18 @@ class TC_GAME_API Map : public GridRefManager<NGridType> GameObject* GetGameObject(ObjectGuid const& guid); Creature* GetCreatureBySpawnId(ObjectGuid::LowType spawnId) const; GameObject* GetGameObjectBySpawnId(ObjectGuid::LowType spawnId) const; - WorldObject* GetWorldObjectBySpawnId(SpawnObjectType type, ObjectGuid::LowType spawnId) const { return (type == SPAWN_TYPE_GAMEOBJECT) ? reinterpret_cast<WorldObject*>(GetGameObjectBySpawnId(spawnId)) : reinterpret_cast<WorldObject*>(GetCreatureBySpawnId(spawnId)); } + WorldObject* GetWorldObjectBySpawnId(SpawnObjectType type, ObjectGuid::LowType spawnId) const + { + switch (type) + { + case SPAWN_TYPE_CREATURE: + return reinterpret_cast<WorldObject*>(GetCreatureBySpawnId(spawnId)); + case SPAWN_TYPE_GAMEOBJECT: + return reinterpret_cast<WorldObject*>(GetGameObjectBySpawnId(spawnId)); + default: + return nullptr; + } + } Transport* GetTransport(ObjectGuid const& guid); DynamicObject* GetDynamicObject(ObjectGuid const& guid); Pet* GetPet(ObjectGuid const& guid); @@ -565,26 +576,21 @@ class TC_GAME_API Map : public GridRefManager<NGridType> RESPAWN TIMES */ time_t GetLinkedRespawnTime(ObjectGuid guid) const; - time_t GetCreatureRespawnTime(ObjectGuid::LowType dbGuid) const - { - RespawnInfoMap::const_iterator itr = _creatureRespawnTimesBySpawnId.find(dbGuid); - return itr != _creatureRespawnTimesBySpawnId.end() ? itr->second->respawnTime : 0; - } - - time_t GetGORespawnTime(ObjectGuid::LowType dbGuid) const + time_t GetRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId) const { - RespawnInfoMap::const_iterator itr = _gameObjectRespawnTimesBySpawnId.find(dbGuid); - return itr != _gameObjectRespawnTimesBySpawnId.end() ? itr->second->respawnTime : 0; + auto const& map = GetRespawnMapForType(type); + auto it = map.find(spawnId); + return (it == map.end()) ? 0 : it->second->respawnTime; } - - time_t GetRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId) const { return (type == SPAWN_TYPE_GAMEOBJECT) ? GetGORespawnTime(spawnId) : GetCreatureRespawnTime(spawnId); } + time_t GetCreatureRespawnTime(ObjectGuid::LowType spawnId) const { return GetRespawnTime(SPAWN_TYPE_CREATURE, spawnId); } + time_t GetGORespawnTime(ObjectGuid::LowType spawnId) const { return GetRespawnTime(SPAWN_TYPE_GAMEOBJECT, spawnId); } void UpdatePlayerZoneStats(uint32 oldZone, uint32 newZone); - void SaveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId, uint32 entry, time_t respawnTime, uint32 zoneId, uint32 gridId = 0, bool writeDB = true, bool replace = false, SQLTransaction dbTrans = nullptr); - void SaveRespawnTimeDB(SpawnObjectType type, ObjectGuid::LowType spawnId, time_t respawnTime, SQLTransaction dbTrans = nullptr); + void SaveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId, uint32 entry, time_t respawnTime, uint32 zoneId, uint32 gridId, SQLTransaction dbTrans = nullptr, bool startup = false); + void SaveRespawnInfoDB(RespawnInfo const& info, SQLTransaction dbTrans = nullptr); void LoadRespawnTimes(); - void DeleteRespawnTimes() { DeleteRespawnInfo(); DeleteRespawnTimesInDB(GetId(), GetInstanceId()); } + void DeleteRespawnTimes() { UnloadAllRespawnInfos(); DeleteRespawnTimesInDB(GetId(), GetInstanceId()); } void LoadCorpseData(); void DeleteCorpseData(); @@ -635,7 +641,6 @@ class TC_GAME_API Map : public GridRefManager<NGridType> virtual std::string GetDebugInfo() const; private: - void LoadMapAndVMap(int gx, int gy); void LoadVMap(int gx, int gy); void LoadMap(int gx, int gy, bool reload = false); @@ -760,45 +765,22 @@ class TC_GAME_API Map : public GridRefManager<NGridType> bool CheckRespawn(RespawnInfo* info); void DoRespawn(SpawnObjectType type, ObjectGuid::LowType spawnId, uint32 gridId); void Respawn(RespawnInfo* info, SQLTransaction dbTrans = nullptr); - void Respawn(std::vector<RespawnInfo*>& respawnData, SQLTransaction dbTrans = nullptr); - void AddRespawnInfo(RespawnInfo& info, bool replace = false); - void DeleteRespawnInfo(); - void DeleteRespawnInfo(RespawnInfo* info); - void DeleteRespawnInfo(std::vector<RespawnInfo*>& toDelete) - { - for (RespawnInfo* info : toDelete) - DeleteRespawnInfo(info); - toDelete.clear(); - } - void DeleteRespawnInfo(SpawnObjectTypeMask types, uint32 zoneId = 0) - { - std::vector<RespawnInfo*> v; - GetRespawnInfo(v, types, zoneId); - if (!v.empty()) - DeleteRespawnInfo(v); - } - void DeleteRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) - { - if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) - DeleteRespawnInfo(info); - } + bool AddRespawnInfo(RespawnInfo const& info); + void UnloadAllRespawnInfos(); + void DeleteRespawnInfo(RespawnInfo* info, SQLTransaction dbTrans = nullptr); public: void GetRespawnInfo(std::vector<RespawnInfo*>& respawnData, SpawnObjectTypeMask types, uint32 zoneId = 0) const; RespawnInfo* GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const; - void RemoveRespawnTime(RespawnInfo* info, bool doRespawn = false, SQLTransaction dbTrans = nullptr); - void RemoveRespawnTime(std::vector<RespawnInfo*>& respawnData, bool doRespawn = false, SQLTransaction dbTrans = nullptr); - void RemoveRespawnTime(SpawnObjectTypeMask types = SPAWN_TYPEMASK_ALL, uint32 zoneId = 0, bool doRespawn = false, SQLTransaction dbTrans = nullptr) + void Respawn(SpawnObjectType type, ObjectGuid::LowType spawnId, SQLTransaction dbTrans = nullptr) { - std::vector<RespawnInfo*> v; - GetRespawnInfo(v, types, zoneId); - if (!v.empty()) - RemoveRespawnTime(v, doRespawn, dbTrans); + if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) + Respawn(info, dbTrans); } - void RemoveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId, bool doRespawn = false, SQLTransaction dbTrans = nullptr) + void RemoveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId,SQLTransaction dbTrans = nullptr) { if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) - RemoveRespawnTime(info, doRespawn, dbTrans); + DeleteRespawnInfo(info, dbTrans); } SpawnGroupTemplateData const* GetSpawnGroupData(uint32 groupId) const; @@ -851,8 +833,30 @@ class TC_GAME_API Map : public GridRefManager<NGridType> RespawnListContainer _respawnTimes; RespawnInfoMap _creatureRespawnTimesBySpawnId; RespawnInfoMap _gameObjectRespawnTimesBySpawnId; - RespawnInfoMap& GetRespawnMapForType(SpawnObjectType type) { return (type == SPAWN_TYPE_GAMEOBJECT) ? _gameObjectRespawnTimesBySpawnId : _creatureRespawnTimesBySpawnId; } - RespawnInfoMap const& GetRespawnMapForType(SpawnObjectType type) const { return (type == SPAWN_TYPE_GAMEOBJECT) ? _gameObjectRespawnTimesBySpawnId : _creatureRespawnTimesBySpawnId; } + RespawnInfoMap& GetRespawnMapForType(SpawnObjectType type) + { + switch (type) + { + default: + ASSERT(false); + case SPAWN_TYPE_CREATURE: + return _creatureRespawnTimesBySpawnId; + case SPAWN_TYPE_GAMEOBJECT: + return _gameObjectRespawnTimesBySpawnId; + } + } + RespawnInfoMap const& GetRespawnMapForType(SpawnObjectType type) const + { + switch (type) + { + default: + ASSERT(false); + case SPAWN_TYPE_CREATURE: + return _creatureRespawnTimesBySpawnId; + case SPAWN_TYPE_GAMEOBJECT: + return _gameObjectRespawnTimesBySpawnId; + } + } void SetSpawnGroupActive(uint32 groupId, bool state); std::unordered_set<uint32> _toggledSpawnGroupIds; |