From b5f3a6fd80c105f94a4fc551be8349ea56e7b251 Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 31 Dec 2020 18:56:53 +0100 Subject: Core/Maps: All RespawnInfo* handed to outside code are now RespawnInfo const*, to signify that outside code has zero business changing these. (cherry picked from commit 803dc789e42ea2298a8bd1822849b6f2df82efe6) --- src/server/scripts/Commands/cs_list.cpp | 2 +- src/server/scripts/Commands/cs_misc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 4eb121024e5..1c6e2786d5a 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -637,7 +637,7 @@ public: handler->PSendSysMessage(LANG_LIST_RESPAWNS_ZONE, EnumUtils::ToTitle(type), zoneName, zoneId); handler->PSendSysMessage(LANG_LIST_RESPAWNS_LISTHEADER); - std::vector respawns; + std::vector respawns; map->GetRespawnInfo(respawns, SpawnObjectTypeMask(1 << type)); for (RespawnInfo const* ri : respawns) { diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b3654b0b33d..9403fa8d178 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1890,12 +1890,12 @@ public: Cell::VisitGridObjects(player, worker, player->GetGridActivationRange()); // Now handle any that had despawned, but had respawn time logged. - std::vector data; + std::vector data; player->GetMap()->GetRespawnInfo(data, SPAWN_TYPEMASK_ALL); if (!data.empty()) { uint32 const gridId = Trinity::ComputeGridCoord(player->GetPositionX(), player->GetPositionY()).GetId(); - for (RespawnInfo* info : data) + for (RespawnInfo const* info : data) if (info->gridId == gridId) player->GetMap()->Respawn(info->type, info->spawnId); } -- cgit v1.2.3