diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-07-11 17:47:14 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-07-11 17:47:14 +0200 |
| commit | fbbcc3167053950d2000cd88bb7d98266491768f (patch) | |
| tree | 170a59a57cf001b16b8e4545d6deda486220dd05 /src/server/game | |
| parent | cbb532e4bec11d59f2072441a43b7c797de6d16d (diff) | |
Core/Misc: Simplify LinkedListHead::isEmpty and rename to empty to fit standard container naming
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Entities/Transport/Transport.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Grids/ObjectGridLoader.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.h | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp index d5b9c11c4f0..56982dc1a1d 100644 --- a/src/server/game/Entities/Transport/Transport.cpp +++ b/src/server/game/Entities/Transport/Transport.cpp @@ -712,11 +712,7 @@ void Transport::UpdatePassengerPositions(PassengerSet const& passengers) void Transport::BuildUpdate(UpdateDataMapType& data_map) { - Map::PlayerList const& players = GetMap()->GetPlayers(); - if (players.isEmpty()) - return; - - for (MapReference const& playerReference : players) + for (MapReference const& playerReference : GetMap()->GetPlayers()) if (playerReference.GetSource()->InSamePhase(this)) BuildFieldsUpdate(playerReference.GetSource(), data_map); diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index afa4ff1dea2..589c1b4075d 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -232,7 +232,7 @@ void PersonalPhaseGridLoader::Load(uint32 phaseId) template<class T> void ObjectGridUnloader::Visit(GridRefManager<T> &m) { - while (!m.isEmpty()) + while (!m.empty()) { T *obj = m.getFirst()->GetSource(); //Some creatures may summon other temp summons in CleanupsBeforeDelete() diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 290bd2f73f9..d8cee631e65 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -811,7 +811,7 @@ void Map::Update(uint32 t_diff) MoveAllGameObjectsInMoveList(); MoveAllAreaTriggersInMoveList(); - if (!m_mapRefManager.isEmpty() || !m_activeNonPlayers.empty()) + if (!m_mapRefManager.empty() || !m_activeNonPlayers.empty()) ProcessRelocationNotifies(t_diff); sScriptMgr->OnMapUpdate(this, t_diff); @@ -3946,7 +3946,7 @@ void Map::SetZoneMusic(uint32 zoneId, uint32 musicId) _zoneDynamicInfo[zoneId].MusicId = musicId; Map::PlayerList const& players = GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { WorldPackets::Misc::PlayMusic playMusic(musicId); playMusic.Write(); @@ -3997,7 +3997,7 @@ void Map::SetZoneWeather(uint32 zoneId, WeatherState weatherId, float intensity) info.Intensity = intensity; Map::PlayerList const& players = GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { WorldPackets::Misc::Weather weather(weatherId, intensity); weather.Write(); @@ -4028,7 +4028,7 @@ void Map::SetZoneOverrideLight(uint32 zoneId, uint32 areaLightId, uint32 overrid } Map::PlayerList const& players = GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { WorldPackets::Misc::OverrideLight overrideLight; overrideLight.AreaLightID = areaLightId; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index af10a1850a8..9468e5d73ec 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -388,7 +388,7 @@ class TC_GAME_API Map : public GridRefManager<NGridType> bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); } void markCell(uint32 pCellId) { marked_cells.set(pCellId); } - bool HavePlayers() const { return !m_mapRefManager.isEmpty(); } + bool HavePlayers() const { return !m_mapRefManager.empty(); } uint32 GetPlayersCountExceptGMs() const; bool ActiveObjectsNearGrid(NGridType const& ngrid) const; |
