diff options
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index d727ed452f8..a751dcf3073 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3093,11 +3093,11 @@ bool Map::CheckRespawn(RespawnInfo* info) return true; } -void Map::Respawn(RespawnInfo const* info, CharacterDatabaseTransaction dbTrans) +void Map::Respawn(RespawnInfo* info, CharacterDatabaseTransaction dbTrans) { if (info->respawnTime <= GameTime::GetGameTime()) return; - const_cast<RespawnInfo*>(info)->respawnTime = GameTime::GetGameTime(); + info->respawnTime = GameTime::GetGameTime(); _respawnTimes.increase(info->handle); SaveRespawnInfoDB(*info, dbTrans); } @@ -3173,7 +3173,7 @@ void Map::GetRespawnInfo(std::vector<RespawnInfo const*>& respawnData, SpawnObje PushRespawnInfoFrom(respawnData, _gameObjectRespawnTimesBySpawnId); } -RespawnInfo const* Map::GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const +RespawnInfo* Map::GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const { RespawnInfoMap const& map = GetRespawnMapForType(type); auto it = map.find(spawnId); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 5fffa8a11c4..81b2299d399 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -292,10 +292,10 @@ struct CompareRespawnInfo { bool operator()(RespawnInfo const* a, RespawnInfo const* b) const; }; -typedef std::unordered_map<uint32 /*zoneId*/, ZoneDynamicInfo> ZoneDynamicInfoMap; -typedef boost::heap::fibonacci_heap<RespawnInfo*, boost::heap::compare<CompareRespawnInfo>> RespawnListContainer; -typedef RespawnListContainer::handle_type RespawnListHandle; -typedef std::unordered_map<ObjectGuid::LowType, RespawnInfo*> RespawnInfoMap; +using ZoneDynamicInfoMap = std::unordered_map<uint32 /*zoneId*/, ZoneDynamicInfo>; +using RespawnListContainer = boost::heap::fibonacci_heap<RespawnInfo*, boost::heap::compare<CompareRespawnInfo>>; +using RespawnListHandle = RespawnListContainer::handle_type; +using RespawnInfoMap = std::unordered_map<ObjectGuid::LowType, RespawnInfo*>; struct RespawnInfo { SpawnObjectType type; @@ -771,22 +771,22 @@ class TC_GAME_API Map : public GridRefManager<NGridType> void DoRespawn(SpawnObjectType type, ObjectGuid::LowType spawnId, uint32 gridId); bool AddRespawnInfo(RespawnInfo const& info); void UnloadAllRespawnInfos(); + RespawnInfo* GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const; + void Respawn(RespawnInfo* info, CharacterDatabaseTransaction dbTrans = nullptr); void DeleteRespawnInfo(RespawnInfo* info, CharacterDatabaseTransaction dbTrans = nullptr); void DeleteRespawnInfoFromDB(SpawnObjectType type, ObjectGuid::LowType spawnId, CharacterDatabaseTransaction dbTrans = nullptr); public: void GetRespawnInfo(std::vector<RespawnInfo const*>& respawnData, SpawnObjectTypeMask types) const; - RespawnInfo const* GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const; void Respawn(SpawnObjectType type, ObjectGuid::LowType spawnId, CharacterDatabaseTransaction dbTrans = nullptr) { - if (RespawnInfo const* info = GetRespawnInfo(type, spawnId)) + if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) Respawn(info, dbTrans); } - void Respawn(RespawnInfo const* info, CharacterDatabaseTransaction dbTrans = nullptr); void RemoveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId, CharacterDatabaseTransaction dbTrans = nullptr, bool alwaysDeleteFromDB = false) { - if (RespawnInfo const* info = GetRespawnInfo(type, spawnId)) - DeleteRespawnInfo(const_cast<RespawnInfo*>(info), dbTrans); + if (RespawnInfo* info = GetRespawnInfo(type, spawnId)) + DeleteRespawnInfo(info, dbTrans); // Some callers might need to make sure the database doesn't contain any respawn time else if (alwaysDeleteFromDB) DeleteRespawnInfoFromDB(type, spawnId, dbTrans); |