diff options
Diffstat (limited to 'src/server')
17 files changed, 34 insertions, 38 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; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index 618a73e744c..f0f12d523ba 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -207,7 +207,7 @@ struct boss_coren_direbrew : public BossAI _JustDied(); Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { if (Group* group = players.begin()->GetSource()->GetGroup()) if (group->isLFGGroup()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index e8cebe4984e..1e8fc7b8fc2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -310,7 +310,7 @@ public: if (WipeTimer <= diff) { Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); - if (PlayerList.isEmpty()) + if (PlayerList.empty()) return; RaidWiped = true; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index f6a442910cd..e692b73ef99 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1263,7 +1263,7 @@ public: { // search players with in 50 yards for quest credit Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); - if (!PlayerList.isEmpty()) + if (!PlayerList.empty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (me->IsWithinDistInMap(i->GetSource(), 500)) diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 31298d59e99..d4cfa912766 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -174,7 +174,7 @@ struct boss_apothecary_hummel : public BossAI instance->SetBossState(BOSS_APOTHECARY_HUMMEL, DONE); Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { if (Group* group = players.begin()->GetSource()->GetGroup()) if (group->isLFGGroup()) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index 55bd29222fb..f4d5a8a0e0d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -97,7 +97,7 @@ class instance_sunwell_plateau : public InstanceMapScript { Map::PlayerList const& players = instance->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp index 5e489251b8c..810eea0fc80 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp @@ -125,7 +125,7 @@ public: //what other conditions to check? bool CanProgressEvent() { - if (instance->GetPlayers().isEmpty()) + if (instance->GetPlayers().empty()) return false; return true; @@ -188,7 +188,7 @@ public: TC_LOG_DEBUG("scripts", "Instance The Black Morass: Event completed."); Map::PlayerList const& players = instance->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index bf35bcda21e..98068756c43 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -98,7 +98,7 @@ void AggroAllPlayers(Creature* temp) { Map::PlayerList const& PlList = temp->GetMap()->GetPlayers(); - if (PlList.isEmpty()) + if (PlList.empty()) return; for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) @@ -254,7 +254,7 @@ public: if (uiChargeTimer <= uiDiff) { Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { @@ -281,7 +281,7 @@ public: if (Unit* pPassenger = pVehicle->GetPassenger(SEAT_ID_0)) { Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { @@ -399,7 +399,7 @@ public: if (uiInterceptTimer <= uiDiff) { Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { @@ -863,7 +863,7 @@ public: else { Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index e3c4e1e6c61..92ce847ad77 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -374,7 +374,7 @@ public: void AggroAllPlayers(Creature* temp) { Map::PlayerList const& PlList = me->GetMap()->GetPlayers(); - if (PlList.isEmpty()) + if (PlList.empty()) return; for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index d30b51119b0..62d157f3b28 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -216,7 +216,7 @@ struct boss_four_horsemen_baseAI : public BossAI } instance->SetBossState(BOSS_HORSEMEN, IN_PROGRESS); Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (players.isEmpty()) // sanity check + if (players.empty()) // sanity check ResetEncounter(); for (Horseman boss : horsemen) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 3cace29b372..c9dcbc761e5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -249,7 +249,7 @@ struct boss_the_lurker_below : public BossAI { InRange = false; Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); - if (!PlayerList.isEmpty()) + if (!PlayerList.empty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 39eb7914045..a6f374e9dca 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -133,7 +133,7 @@ class instance_serpent_shrine : public InstanceMapScript Water = WATERSTATE_FRENZY; Map::PlayerList const& PlayerList = instance->GetPlayers(); - if (PlayerList.isEmpty()) + if (PlayerList.empty()) return; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index e384bb3a078..3912f905075 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -203,7 +203,7 @@ struct boss_ahune : public BossAI Unit::Kill(me, frozenCore); Map::PlayerList const& players = me->GetMap()->GetPlayers(); - if (!players.isEmpty()) + if (!players.empty()) { if (Group* group = players.begin()->GetSource()->GetGroup()) if (group->isLFGGroup()) diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index bc4a10da741..01a2e2610a8 100644 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -83,7 +83,7 @@ class LinkedListElement LinkedListElement& operator=(LinkedListElement&&) = delete; protected: - virtual ~LinkedListElement() + ~LinkedListElement() { delink(); } @@ -107,13 +107,13 @@ class LinkedListHead iLast.iPrev = &iFirst; } - bool isEmpty() const { return(!iFirst.iNext->isInList()); } + bool empty() const { return iFirst.iNext == &iLast; } - LinkedListElement * getFirst() { return (isEmpty() ? nullptr : iFirst.iNext); } - LinkedListElement const* getFirst() const { return (isEmpty() ? nullptr : iFirst.iNext); } + LinkedListElement * getFirst() { return (empty() ? nullptr : iFirst.iNext); } + LinkedListElement const* getFirst() const { return (empty() ? nullptr : iFirst.iNext); } - LinkedListElement * getLast() { return(isEmpty() ? nullptr : iLast.iPrev); } - LinkedListElement const* getLast() const { return(isEmpty() ? nullptr : iLast.iPrev); } + LinkedListElement * getLast() { return (empty() ? nullptr : iLast.iPrev); } + LinkedListElement const* getLast() const { return (empty() ? nullptr : iLast.iPrev); } void insertFirst(LinkedListElement* pElem) { @@ -166,18 +166,18 @@ class LinkedListHead { // construct with node pointer _Pnode } - Iterator& operator=(const_pointer const& _Right) + Iterator& operator=(const_pointer _Right) { - _Ptr = pointer(_Right); + _Ptr = const_cast<pointer>(_Right); return *this; } - reference operator*() + reference operator*() const { // return designated value return *_Ptr; } - pointer operator->() + pointer operator->() const { // return pointer to class object return _Ptr; } |