diff options
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Grids/GridRefManager.h | 2 | ||||
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Instances/InstanceScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Dynamic/LinkedList.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index 5e1ed43ab1e..1c3df7302cb 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -2850,7 +2850,7 @@ bool CriteriaHandler::ModifierSatisfied(ModifierTreeEntry const* modifier, uint6 break; } case ModifierTreeType::InstancePlayerCountEqual: // 171 - if (referencePlayer->GetMap()->GetPlayers().getSize() != reqValue) + if (referencePlayer->GetMap()->GetPlayers().size() != reqValue) return false; break; case ModifierTreeType::CurrencyId: // 172 diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h index 6f58ddb78a0..e4e60749f6a 100644 --- a/src/server/game/Grids/GridRefManager.h +++ b/src/server/game/Grids/GridRefManager.h @@ -48,7 +48,7 @@ struct GridRefManagerContainer static std::size_t Size(Container const& container) { - return container.getSize(); + return container.size(); } }; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 763b6b001a2..b15b6d6768a 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -661,7 +661,7 @@ bool Group::RemoveMember(ObjectGuid guid, RemoveMethod method /*= GROUP_REMOVEME } } - if (m_memberMgr.getSize() < ((isLFGGroup() || isBGGroup()) ? 1u : 2u)) + if (m_memberMgr.size() < ((isLFGGroup() || isBGGroup()) ? 1u : 2u)) Disband(); else if (player) { diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index da687f920d4..a4e608c1716 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -991,7 +991,7 @@ void InstanceScript::ResetCombatResurrections() uint32 InstanceScript::GetCombatResurrectionChargeInterval() const { uint32 interval = 0; - if (uint32 playerCount = instance->GetPlayers().getSize()) + if (uint32 playerCount = instance->GetPlayers().size()) interval = 90 * MINUTE * IN_MILLISECONDS / playerCount; return interval; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index d8cee631e65..fe5a11415c8 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2955,7 +2955,7 @@ void InstanceMap::RemovePlayerFromMap(Player* player, bool remove) i_data->OnPlayerLeave(player); // if last player set unload timer - if (!m_unloadTimer && m_mapRefManager.getSize() == 1) + if (!m_unloadTimer && m_mapRefManager.size() == 1) m_unloadTimer = (i_instanceLock && i_instanceLock->IsExpired()) ? MIN_UNLOAD_DELAY : std::max(sWorld->getIntConfig(CONFIG_INSTANCE_UNLOAD_DELAY), (uint32)MIN_UNLOAD_DELAY); if (i_scenario) diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 7d06b19153e..bc3a8c1c154 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -411,7 +411,7 @@ uint32 MapManager::GetNumInstances() const uint32 MapManager::GetNumPlayersInInstances() const { std::shared_lock<std::shared_mutex> lock(_mapsLock); - return std::accumulate(i_maps.begin(), i_maps.end(), 0u, [](uint32 total, MapMapType::value_type const& value) { return total + (value.second->IsDungeon() ? value.second->GetPlayers().getSize() : 0); }); + return std::accumulate(i_maps.begin(), i_maps.end(), 0u, [](uint32 total, MapMapType::value_type const& value) { return total + (value.second->IsDungeon() ? value.second->GetPlayers().size() : 0); }); } void MapManager::InitInstanceIds() diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index 24ee3e052b0..c9736fcacbd 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -142,7 +142,7 @@ struct boss_morogrim_tidewalker : public BossAI void JustEngagedWith(Unit* who) override { - Playercount = me->GetMap()->GetPlayers().getSize(); + Playercount = me->GetMap()->GetPlayers().size(); Talk(SAY_AGGRO); _JustEngagedWith(who); } diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index 01a2e2610a8..312225488ca 100644 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -125,7 +125,7 @@ class LinkedListHead iLast.insertBefore(pElem); } - uint32 getSize() const + uint32 size() const { if (!iSize) { |