diff options
| author | Malcrom <malcromdev@gmail.com> | 2013-06-11 21:25:12 -0230 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2013-06-11 21:25:12 -0230 |
| commit | ec474a62e562b3264cc05346fe4c9a1d4f969645 (patch) | |
| tree | adca8bc224ca567a5070eee9b2b762fff0e7528d /src/server/scripts/Northrend | |
| parent | 66978cfc3b672309ed79da917695bc59427974aa (diff) | |
Core: More Function Renaming.
Diffstat (limited to 'src/server/scripts/Northrend')
33 files changed, 82 insertions, 82 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index 6b58210355f..692f4c2d25c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -123,7 +123,7 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* player = i->getSource(); + Player* player = i->GetSource(); if (!player || !player->IsAlive()) continue; // Summon clone @@ -144,7 +144,7 @@ public: Map::PlayerList const &players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { - Player* player = i->getSource(); + Player* player = i->GetSource(); player->RemoveAurasDueToSpell(GetSpellForPhaseMask(player->GetPhaseMask())); } } @@ -245,7 +245,7 @@ public: { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { if (player->HasAura(spell)) { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 00a909e8931..f2bdf829494 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -178,7 +178,7 @@ public: if (instance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) != IN_PROGRESS || !bOnGround) return; - if (!me->GetVictim() && me->canCreatureAttack(who)) + if (!me->GetVictim() && me->CanCreatureAttack(who)) { float attackRadius = me->GetAttackDistance(who); if (me->IsWithinDistInMap(who, attackRadius) && me->IsWithinLOSInMap(who)) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 901587ae56d..2b1cc2590ca 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -521,8 +521,8 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource() && i->getSource()->IsAlive()) - Talk(WHISPER_LAVA_CHURN, i->getSource()->GetGUID()); + if (i->GetSource() && i->GetSource()->IsAlive()) + Talk(WHISPER_LAVA_CHURN, i->GetSource()->GetGUID()); } } @@ -818,7 +818,7 @@ struct dummy_dragonAI : public ScriptedAI if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - Talk(iTextId, i->getSource()->GetGUID()); + Talk(iTextId, i->GetSource()->GetGUID()); } } } @@ -1330,12 +1330,12 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->IsAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->GetVictim()) + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->GetSource()->GetVictim()) { - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_RESIDUE, true); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } } } @@ -1429,15 +1429,15 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->IsAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->GetVictim()) + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->GetSource()->GetVictim()) { - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); - i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->GetSource()->CastSpell(i->GetSource(), SPELL_TWILIGHT_RESIDUE, true); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } - if (i->getSource()->IsAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->getSource()->GetVictim()) - i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); + if (i->GetSource()->IsAlive() && i->GetSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->GetSource()->GetVictim()) + i->GetSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } } 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 a5914766981..2127ee51ace 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -102,9 +102,9 @@ void AggroAllPlayers(Creature* temp) for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; if (player->IsAlive()) @@ -255,8 +255,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreat(); me->AddThreat(player, 1.0f); @@ -282,8 +282,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 10.0f, 30.0f, false)) { pPassenger->CastSpell(player, SPELL_SHIELD_BREAKER, true); break; @@ -396,8 +396,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreat(); me->AddThreat(player, 5.0f); @@ -851,8 +851,8 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player && !player->isGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) + Player* player = itr->GetSource(); + if (player && !player->IsGameMaster() && me->IsInRange(player, 5.0f, 30.0f, false)) { DoCast(player, SPELL_MULTI_SHOT); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 2cd4c7a9ee4..aa9314b84ee 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -108,7 +108,7 @@ public: if (!players.isEmpty()) { - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } 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 0c7d644c4fd..468ffa58d1d 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 @@ -394,9 +394,9 @@ public: for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) { - if (player->isGameMaster()) + if (player->IsGameMaster()) continue; if (player->IsAlive()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index a511bd4f21c..c8cab5e6c98 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -632,7 +632,7 @@ struct boss_faction_championsAI : public BossAI uint32 TeamInInstance = 0; if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); if (instance) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index da90ff4b959..21c3c983c64 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -1089,7 +1089,7 @@ class boss_icehowl : public CreatureScript Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) { - if (Unit* player = itr->getSource()) + if (Unit* player = itr->GetSource()) { if (player->IsAlive() && player->IsWithinDistInMap(me, 6.0f)) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 1f461c8c285..40febbd530a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -286,7 +286,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript state = DONE; break; case DONE: - if (instance->GetPlayers().getFirst()->getSource()->GetTeam() == ALLIANCE) + if (instance->GetPlayers().getFirst()->GetSource()->GetTeam() == ALLIANCE) EventStage = 4020; else EventStage = 4030; @@ -375,7 +375,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript // decrease attempt counter at wipe Map::PlayerList const &PlayerList = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) player->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, TrialCounter); // if theres no more attemps allowed diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 0ca7ccd196a..873a359b549 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -234,7 +234,7 @@ public: Map::PlayerList const &PlayerList = instance->instance->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (Player* player = i->getSource()) + if (Player* player = i->GetSource()) player->DeMorph(); DoCast(me, SPELL_ACHIEVEMENT_CHECK); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 5014f78c9a3..03f67765406 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -47,7 +47,7 @@ class instance_forge_of_souls : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) teamInInstance = player->GetTeam(); switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 9e037b39a7d..abdd5db9d6f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1209,7 +1209,7 @@ public: { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; if (instance->GetData(DATA_INTRO_EVENT) == NOT_STARTED) @@ -1230,7 +1230,7 @@ public: { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster()) + if (player->IsGameMaster()) return true; if (instance->GetData(DATA_WAVE_COUNT)) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 4ba6a20cc5d..b23eb8d6ab8 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -101,7 +101,7 @@ public: { Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) _teamInInstance = player->GetTeam(); switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 327aa56e3e6..6df01aae7b9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -530,7 +530,7 @@ class spell_krick_explosive_barrage : public SpellScriptLoader { Map::PlayerList const &players = caster->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->IsWithinDist(caster, 60.0f)) // don't know correct range caster->CastSpell(player, SPELL_EXPLOSIVE_BARRAGE_SUMMON, true); } diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index c8aa579e2a8..195a974a8d3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -505,7 +505,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { InstanceScript* instance = player->GetInstanceScript(); - if (player->isGameMaster() || !instance) + if (player->IsGameMaster() || !instance) return false; if (instance->GetBossState(DATA_TYRANNUS) != IN_PROGRESS && instance->GetBossState(DATA_TYRANNUS) != DONE) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index fa2805bdb4c..1abdf2acd60 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -65,7 +65,7 @@ class instance_pit_of_saron : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) _teamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 81402943ffb..2863d81160e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -321,7 +321,7 @@ class boss_lady_deathwhisper : public CreatureScript if (Group* group = owner->GetGroup()) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) member->KilledMonsterCredit(NPC_DARNAVAN_CREDIT, 0); } else @@ -858,7 +858,7 @@ class npc_darnavan : public CreatureScript if (Group* group = owner->GetGroup()) { for (GroupReference* itr = group->GetFirstMember(); itr != NULL; itr = itr->next()) - if (Player* member = itr->getSource()) + if (Player* member = itr->GetSource()) member->FailQuest(QUEST_DEPROGRAMMING); } else diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 717af9a3a35..192ba06426d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1142,7 +1142,7 @@ class boss_the_lich_king : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_THE_FROZEN_THRONE) player->GetSession()->SendPacket(data); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index db4ab2f32d2..99af60d7bea 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -172,7 +172,7 @@ class instance_icecrown_citadel : public InstanceMapScript { Map::PlayerList const &players = instance->GetPlayers(); if (!players.isEmpty()) - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 54bd1fcd33f..1138e3a463f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -324,19 +324,19 @@ class boss_gothik : public CreatureScript bool checkdead = false; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->IsAlive() && - i->getSource()->GetPositionX() <= POS_X_NORTH && - i->getSource()->GetPositionX() >= POS_X_SOUTH && - i->getSource()->GetPositionY() <= POS_Y_GATE && - i->getSource()->GetPositionY() >= POS_Y_EAST) + if (i->GetSource() && i->GetSource()->IsAlive() && + i->GetSource()->GetPositionX() <= POS_X_NORTH && + i->GetSource()->GetPositionX() >= POS_X_SOUTH && + i->GetSource()->GetPositionY() <= POS_Y_GATE && + i->GetSource()->GetPositionY() >= POS_Y_EAST) { checklife = true; } - else if (i->getSource() && i->getSource()->IsAlive() && - i->getSource()->GetPositionX() <= POS_X_NORTH && - i->getSource()->GetPositionX() >= POS_X_SOUTH && - i->getSource()->GetPositionY() >= POS_Y_GATE && - i->getSource()->GetPositionY() <= POS_Y_WEST) + else if (i->GetSource() && i->GetSource()->IsAlive() && + i->GetSource()->GetPositionX() <= POS_X_NORTH && + i->GetSource()->GetPositionX() >= POS_X_SOUTH && + i->GetSource()->GetPositionY() >= POS_Y_GATE && + i->GetSource()->GetPositionY() <= POS_Y_WEST) { checkdead = true; } @@ -561,9 +561,9 @@ class mob_gothik_minion : public CreatureScript { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource() && i->getSource()->IsAlive() && isOnSameSide(i->getSource())) + if (i->GetSource() && i->GetSource()->IsAlive() && isOnSameSide(i->GetSource())) { - AttackStart(i->getSource()); + AttackStart(i->GetSource()); return; } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 8878ed7dc16..f7a7f233c8c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -660,7 +660,7 @@ public: bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/) { - if (player->isGameMaster()) + if (player->IsGameMaster()) return false; InstanceScript* instance = player->GetInstanceScript(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 0e5941138a6..dd4d829201a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -174,7 +174,7 @@ class boss_sapphiron : public CreatureScript Map::PlayerList const &players = _map->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (itr->getSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) + if (itr->GetSource()->GetResistance(SPELL_SCHOOL_FROST) > MAX_FROST_RESISTANCE) { _canTheHundredClub = false; break; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index a7abd14fae4..9fe4c930768 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1046,7 +1046,7 @@ public: Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (!players.isEmpty()) for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->GetAreaId() == AREA_EYE_OF_ETERNITY) player->GetSession()->SendPacket(data); } @@ -1901,7 +1901,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader if (Unit* target = (*itr)->getTarget()) { Player* targetPlayer = target->ToPlayer(); - if (!targetPlayer || targetPlayer->isGameMaster()) + if (!targetPlayer || targetPlayer->IsGameMaster()) continue; if (InstanceScript* instance = caster->GetInstanceScript()) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 079732b0f14..696ef48ba93 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -206,7 +206,7 @@ public: { Player* player = target->ToPlayer(); - if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4)) + if (!player || player->IsGameMaster() || player->HasAura(SPELL_VORTEX_4)) continue; player->CastSpell(trigger, SPELL_VORTEX_4, true); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp index 81d5141a6a6..03d97ebf33d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp @@ -71,7 +71,7 @@ public: if (!players.isEmpty()) { - if (Player* player = players.begin()->getSource()) + if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } switch (creature->GetEntry()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 1642cc0483f..5ee55febba3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -231,7 +231,7 @@ class boss_general_vezax : public CreatureScript // If Shaman has Shamanistic Rage and use it during the fight, it will cast Corrupted Rage on him Map::PlayerList const& Players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = Players.begin(); itr != Players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) if (player->HasSpell(SPELL_SHAMANTIC_RAGE)) player->CastSpell(player, SPELL_CORRUPTED_RAGE, false); } @@ -278,7 +278,7 @@ class boss_general_vezax : public CreatureScript Map::PlayerList const& Players = map->GetPlayers(); for (Map::PlayerList::const_iterator itr = Players.begin(); itr != Players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { float distance = player->GetDistance(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); if (rangeMin > distance || distance > rangeMax) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index a48e4955140..cd3c059ad24 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -448,7 +448,7 @@ class boss_voice_of_yogg_saron : public CreatureScript // not sure, spoken by Sara (sound), regarding to wowwiki Voice whispers it Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { if (events.IsInPhase(PHASE_ONE)) Talk(WHISPER_VOICE_PHASE_1_WIPE, player->GetGUID()); @@ -932,7 +932,7 @@ class boss_yogg_saron : public CreatureScript Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { player->RemoveAurasDueToSpell(SPELL_SANITY); player->RemoveAurasDueToSpell(SPELL_INSANE); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 926ab4c9302..4f7cbbff099 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -232,7 +232,7 @@ class instance_ulduar : public InstanceMapScript { Map::PlayerList const& Players = instance->GetPlayers(); if (!Players.isEmpty()) - if (Player* player = Players.begin()->getSource()) + if (Player* player = Players.begin()->GetSource()) TeamInInstance = player->GetTeam(); } @@ -724,7 +724,7 @@ class instance_ulduar : public InstanceMapScript // get item level (recheck weapons) Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) for (uint8 slot = EQUIPMENT_SLOT_MAINHAND; slot <= EQUIPMENT_SLOT_RANGED; ++slot) if (Item* item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, slot)) if (item->GetTemplate()->ItemLevel > _maxWeaponItemLevel) @@ -736,7 +736,7 @@ class instance_ulduar : public InstanceMapScript Map::PlayerList const& players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) { for (uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 562aa5a3848..536e7293b69 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -116,7 +116,7 @@ public: { for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - if (Player* player = itr->getSource()) + if (Player* player = itr->GetSource()) return player; } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 59162e6ba44..d05f475b22f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -288,8 +288,8 @@ public: if (!PlayerList.isEmpty()) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) - if (i->getSource()->IsAlive()) - DoTeleportPlayer(i->getSource(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), i->getSource()->GetOrientation()); + if (i->GetSource()->IsAlive()) + DoTeleportPlayer(i->GetSource(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), i->GetSource()->GetOrientation()); } uiSummonPlayers_Timer = urand(33000, 35000); diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 6ee78181a17..ef96b1ea86f 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -671,8 +671,8 @@ public: Map::PlayerList const &players = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { - Player* player = itr->getSource(); - if (player->isGameMaster()) + Player* player = itr->GetSource(); + if (player->IsGameMaster()) continue; if (player->IsAlive()) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index a50f9221745..d5181d68680 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -80,7 +80,7 @@ public: Player* player = who->GetCharmerOrOwnerPlayerOrPlayerItself(); - if (!player || player->isGameMaster() || player->IsBeingTeleported() || + if (!player || player->IsGameMaster() || player->IsBeingTeleported() || // If player has Disguise aura for quest A Meeting With The Magister or An Audience With The Arcanist, do not teleport it away but let it pass player->HasAura(SPELL_SUNREAVER_DISGUISE_FEMALE) || player->HasAura(SPELL_SUNREAVER_DISGUISE_MALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_FEMALE) || player->HasAura(SPELL_SILVER_COVENANT_DISGUISE_MALE)) diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 0fb0b39c4e7..43b5eaefc62 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -120,7 +120,7 @@ class npc_wg_demolisher_engineer : public CreatureScript if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (canBuild(creature)) + if (CanBuild(creature)) { if (player->HasAura(SPELL_CORPORAL)) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_DEMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); @@ -142,7 +142,7 @@ class npc_wg_demolisher_engineer : public CreatureScript { player->CLOSE_GOSSIP_MENU(); - if (canBuild(creature)) + if (CanBuild(creature)) { switch (action - GOSSIP_ACTION_INFO_DEF) { @@ -163,7 +163,7 @@ class npc_wg_demolisher_engineer : public CreatureScript } private: - bool canBuild(Creature* creature) + bool CanBuild(Creature* creature) { Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG); if (!wintergrasp) |
