From 7ee0891b0fa4589ba39ad63cc93e760f56d7adf2 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 17 Aug 2019 22:40:50 +0200 Subject: Warning fix --- src/server/game/Maps/Map.cpp | 2 +- src/server/game/Maps/Map.h | 2 +- src/server/scripts/Commands/cs_list.cpp | 2 +- src/server/scripts/Commands/cs_misc.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index bc0f086b856..5baf83a7f73 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3100,7 +3100,7 @@ static void PushRespawnInfoFrom(std::vector& data, RespawnInfoMap data.push_back(pair.second); } -void Map::GetRespawnInfo(std::vector& respawnData, SpawnObjectTypeMask types, uint32 zoneId) const +void Map::GetRespawnInfo(std::vector& respawnData, SpawnObjectTypeMask types) const { if (types & SPAWN_TYPEMASK_CREATURE) PushRespawnInfoFrom(respawnData, _creatureRespawnTimesBySpawnId); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index aac75c95026..6ccd19b0843 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -769,7 +769,7 @@ class TC_GAME_API Map : public GridRefManager void DeleteRespawnInfo(RespawnInfo* info, SQLTransaction dbTrans = nullptr); public: - void GetRespawnInfo(std::vector& respawnData, SpawnObjectTypeMask types, uint32 zoneId = 0) const; + void GetRespawnInfo(std::vector& respawnData, SpawnObjectTypeMask types) const; RespawnInfo* GetRespawnInfo(SpawnObjectType type, ObjectGuid::LowType spawnId) const; void Respawn(SpawnObjectType type, ObjectGuid::LowType spawnId, SQLTransaction dbTrans = nullptr) { diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index e6981873cc9..fdbb12fd366 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -706,7 +706,7 @@ public: handler->PSendSysMessage(LANG_LIST_RESPAWNS_LISTHEADER); std::vector respawns; - map->GetRespawnInfo(respawns, SpawnObjectTypeMask(1 << type), range ? 0 : zoneId); + map->GetRespawnInfo(respawns, SpawnObjectTypeMask(1 << type)); for (RespawnInfo const* ri : respawns) { SpawnData const* data = sObjectMgr->GetSpawnData(ri->type, ri->spawnId); diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b4866d64933..7f8879a370e 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1902,7 +1902,7 @@ public: // Now handle any that had despawned, but had respawn time logged. std::vector data; - player->GetMap()->GetRespawnInfo(data, SPAWN_TYPEMASK_ALL, 0); + player->GetMap()->GetRespawnInfo(data, SPAWN_TYPEMASK_ALL); if (!data.empty()) { uint32 const gridId = Trinity::ComputeGridCoord(player->GetPositionX(), player->GetPositionY()).GetId(); -- cgit v1.2.3