diff options
Diffstat (limited to 'src/server/scripts/Northrend')
26 files changed, 177 insertions, 177 deletions
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 3b9827100e4..f58f43f2f72 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -346,9 +346,9 @@ public: DoMeleeAttackIfReady(); } - void JustSummoned(Creature* pSummon) + void JustSummoned(Creature* summon) { - MemoryGUID = pSummon->GetGUID(); + MemoryGUID = summon->GetGUID(); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 1e0502c61ed..5f22a0fa3f9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -144,10 +144,10 @@ public: SummonList.clear(); } - void JustSummoned(Creature* pSummon) + void JustSummoned(Creature* summon) { - SummonList.push_back(pSummon->GetGUID()); - pSummon->AI()->AttackStart(me->getVictim()); + SummonList.push_back(summon->GetGUID()); + summon->AI()->AttackStart(me->getVictim()); } void UpdateAI(const uint32 uiDiff) 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 8203c758d5f..e05f2044f74 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 @@ -180,8 +180,8 @@ public: if (uiData == IN_PROGRESS) { for (std::list<uint64>::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr) - if (Creature* pSummon = instance->GetCreature(*itr)) - pSummon->RemoveFromWorld(); + if (Creature* summon = instance->GetCreature(*itr)) + summon->RemoveFromWorld(); }else if (uiData == DONE) { ++uiGrandChampionsDeaths; 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 92765eee380..d7c486096bd 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 @@ -146,8 +146,8 @@ public: } for (std::list<uint64>::const_iterator itr = TempList.begin(); itr != TempList.end(); ++itr) - if (Creature* pSummon = Unit::GetCreature(*me, *itr)) - AggroAllPlayers(pSummon); + if (Creature* summon = Unit::GetCreature(*me, *itr)) + AggroAllPlayers(summon); }else if (uiLesserChampions == 9) StartGrandChampionsAttack(); @@ -420,8 +420,8 @@ public: if (!Champion1List.empty()) { for (std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) - if (Creature* pSummon = Unit::GetCreature(*me, *itr)) - AggroAllPlayers(pSummon); + if (Creature* summon = Unit::GetCreature(*me, *itr)) + AggroAllPlayers(summon); NextStep(0, false); } break; @@ -432,18 +432,18 @@ public: return; } - void JustSummoned(Creature* pSummon) + void JustSummoned(Creature* summon) { if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { - pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->SetReactState(REACT_PASSIVE); + summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + summon->SetReactState(REACT_PASSIVE); } } - void SummonedCreatureDespawn(Creature* pSummon) + void SummonedCreatureDespawn(Creature* summon) { - switch(pSummon->GetEntry()) + switch(summon->GetEntry()) { case VEHICLE_DARNASSIA_NIGHTSABER: case VEHICLE_EXODAR_ELEKK: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 1119814985a..392f160d0c5 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -222,27 +222,27 @@ public: m_pInstance->SetData(TYPE_ANUBARAK, DONE); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true); - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case NPC_BURROW: - m_vBurrowGUID.push_back(pSummoned->GetGUID()); - pSummoned->SetReactState(REACT_PASSIVE); - pSummoned->CastSpell(pSummoned, SPELL_CHURNING_GROUND, false); + m_vBurrowGUID.push_back(summoned->GetGUID()); + summoned->SetReactState(REACT_PASSIVE); + summoned->CastSpell(summoned, SPELL_CHURNING_GROUND, false); break; case NPC_SPIKE: - pSummoned->CombatStart(target); + summoned->CombatStart(target); DoScriptText(EMOTE_SPIKE, me, target); break; } - Summons.Summon(pSummoned); + Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* summoned) { - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case NPC_SPIKE: m_uiPursuingSpikeTimer = 2*IN_MILLISECONDS; @@ -264,8 +264,8 @@ public: me->SummonCreature(NPC_BURROW, AnubarakLoc[i+2]); //Spawn Frost Spheres for (int i=0; i < 6; i++) - if (Unit* pSummoned = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) - m_aSphereGUID[i] = pSummoned->GetGUID(); + if (Unit* summoned = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) + m_aSphereGUID[i] = summoned->GetGUID(); } void UpdateAI(const uint32 uiDiff) @@ -377,8 +377,8 @@ public: { if (!pSphere->HasAura(SPELL_FROST_SPHERE)) { - if (Creature* pSummon = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) - m_aSphereGUID[i] = pSummon->GetGUID(); + if (Creature* summon = me->SummonCreature(NPC_FROST_SPHERE, SphereSpawn[i])) + m_aSphereGUID[i] = summon->GetGUID(); break; } } 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 727fce6260f..c0abd53e007 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -1737,9 +1737,9 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - Summons.Summon(pSummoned); + Summons.Summon(summoned); } void SummonedCreatureDespawn(Creature* /*pSummoned*/) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 037e5b42045..2f81d26f801 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -158,9 +158,9 @@ public: m_pInstance->SetData(TYPE_JARAXXUS, DONE); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - Summons.Summon(pSummoned); + Summons.Summon(summoned); } void EnterCombat(Unit* /*who*/) @@ -324,10 +324,10 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - Summons.Summon(pSummoned); - pSummoned->SetCorpseDelay(0); + Summons.Summon(summoned); + summoned->SetCorpseDelay(0); } void JustDied(Unit* /*killer*/) @@ -453,10 +453,10 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - Summons.Summon(pSummoned); - pSummoned->SetCorpseDelay(0); + Summons.Summon(summoned); + summoned->SetCorpseDelay(0); } void UpdateAI(const uint32 uiDiff) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index d9d5fc23ba2..b93c2c23c65 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -205,21 +205,21 @@ struct boss_twin_baseAI : public ScriptedAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case NPC_UNLEASHED_DARK: case NPC_UNLEASHED_LIGHT: - pSummoned->SetCorpseDelay(0); + summoned->SetCorpseDelay(0); break; } - Summons.Summon(pSummoned); + Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* summoned) { - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case NPC_LIGHT_ESSENCE: m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_LIGHT_ESSENCE_HELPER); @@ -228,7 +228,7 @@ struct boss_twin_baseAI : public ScriptedAI m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_DARK_ESSENCE_HELPER); break; } - Summons.Despawn(pSummoned); + Summons.Despawn(summoned); } void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index aa50ccb4fc2..24c27099891 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -249,10 +249,10 @@ class boss_lich_king_toc : public CreatureScript { m_uiUpdateTimer = 0; me->SetReactState(REACT_PASSIVE); - if (Creature* pSummoned = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[2].GetPositionX(), ToCCommonLoc[2].GetPositionY(), ToCCommonLoc[2].GetPositionZ(), 5, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* summoned = me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[2].GetPositionX(), ToCCommonLoc[2].GetPositionY(), ToCCommonLoc[2].GetPositionZ(), 5, TEMPSUMMON_TIMED_DESPAWN, 60000)) { - pSummoned->CastSpell(pSummoned, 51807, false); - pSummoned->SetDisplayId(11686); + summoned->CastSpell(summoned, 51807, false); + summoned->SetDisplayId(11686); } if (m_pInstance) m_pInstance->SetData(TYPE_LICH_KING, IN_PROGRESS); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -401,9 +401,9 @@ class npc_fizzlebang_toc : public CreatureScript } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - Summons.Summon(pSummoned); + Summons.Summon(summoned); } void UpdateAI(const uint32 uiDiff) diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index cf8295b6360..3779ed42329 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -148,8 +148,8 @@ public: case PHASE_1: if (uiTimer <= diff) { - Creature* pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); - pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); + Creature* summon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); + summon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); //If spell is casted stops casting arcane field so no spell casting //DoCast(me, SPELL_SUMMON_MINIONS); uiTimer = 3*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 0879ceca9ec..c34f64df816 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -122,31 +122,31 @@ struct boss_horAI : ScriptedAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - summons.Summon(pSummoned); + summons.Summon(summoned); - if (Unit* pUnit = pSummoned->SelectNearestTarget()) + if (Unit* target = summoned->SelectNearestTarget()) { - if (pSummoned->AI()) - pSummoned->AI()->AttackStart(pUnit); + if (summoned->AI()) + summoned->AI()->AttackStart(target); else { - pSummoned->GetMotionMaster()->MoveChase(pUnit); - pSummoned->Attack(pUnit, true); + summoned->GetMotionMaster()->MoveChase(target); + summoned->Attack(target, true); } } - if (pSummoned->AI()) - pSummoned->AI()->DoZoneInCombat(); + if (summoned->AI()) + summoned->AI()->DoZoneInCombat(); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* summoned) { - summons.Despawn(pSummoned); + summons.Despawn(summoned); if (summons.empty()) { - if (pSummoned->isAlive()) + if (summoned->isAlive()) pInstance->SetData(DATA_WAVE_COUNT, NOT_STARTED); else pInstance->SetData(DATA_WAVE_COUNT, SPECIAL); 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 82836bd7478..8cf78c92810 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 @@ -376,28 +376,28 @@ public: } // spawn a wave on behalf of the summoner. - void SpawnWave(Creature* pSummoner) + void SpawnWave(Creature* summoner) { uint32 index; - pSummoner->SetVisible(true); + summoner->SetVisible(true); // TODO: do composition at random. # of spawn also depends on uiWaveCount // As of now, it is just one of each. index = urand(0, ENCOUNTER_WAVE_MERCENARY-1); - pSummoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + summoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); index = urand(0, ENCOUNTER_WAVE_FOOTMAN-1); - pSummoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + summoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); index = urand(0, ENCOUNTER_WAVE_RIFLEMAN-1); - pSummoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + summoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); index = urand(0, ENCOUNTER_WAVE_PRIEST-1); - pSummoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + summoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); index = urand(0, ENCOUNTER_WAVE_MAGE-1); - pSummoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); + summoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); } void Update(uint32 diff) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index c76446954fb..d22070eafb1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -265,8 +265,8 @@ public: case EVENT_BLIZZARD: { //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature* pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) - pSummon->GetMotionMaster()->MoveRandom(40); + if (Creature* summon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) + summon->GetMotionMaster()->MoveRandom(40); events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); break; } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 19592cbbd9e..f7b8cc166bf 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -191,28 +191,28 @@ public: uiDamage = 0; } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) + if (summoned->GetEntry() == NPC_SPARK_OF_IONAR) { - lSparkList.Summon(pSummoned); + lSparkList.Summon(summoned); - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER, H_SPELL_SPARK_VISUAL_TRIGGER), true); + summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER, H_SPELL_SPARK_VISUAL_TRIGGER), true); Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (target) { - pSummoned->SetInCombatWith(target); - pSummoned->GetMotionMaster()->Clear(); - pSummoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); + summoned->SetInCombatWith(target); + summoned->GetMotionMaster()->Clear(); + summoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); } } } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* summoned) { - if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) - lSparkList.Despawn(pSummoned); + if (summoned->GetEntry() == NPC_SPARK_OF_IONAR) + lSparkList.Despawn(summoned); } void UpdateAI(const uint32 uiDiff) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 4aa0707e625..8bb4624f3c6 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -211,17 +211,17 @@ public: } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - if (pSummoned->GetEntry() == NPC_MOLTEN_GOLEM) + if (summoned->GetEntry() == NPC_MOLTEN_GOLEM) { - m_lGolemGUIDList.push_back(pSummoned->GetGUID()); + m_lGolemGUIDList.push_back(summoned->GetGUID()); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - pSummoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); + summoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); // Why healing when just summoned? - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_HEAT_N, SPELL_HEAT_H), false, NULL, NULL, me->GetGUID()); + summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_HEAT_N, SPELL_HEAT_H), false, NULL, NULL, me->GetGUID()); } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 8edb4226fc4..044c01b6687 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -232,11 +232,11 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* pSummon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(CREATURE_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { - pSummon->SetDisplayId(11686); - pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->CastSpell(target, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true); + summon->SetDisplayId(11686); + summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + summon->CastSpell(target, DUNGEON_MODE(SPELL_DARK_MATTER, H_SPELL_DARK_MATTER), true); } } uiMarnakEncounterTimer = 30000 + rand()%1000; @@ -248,11 +248,11 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - if (Creature* pSummon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) + if (Creature* summon = me->SummonCreature(CREATURE_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { - pSummon->SetDisplayId(11686); - pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pSummon->CastSpell(target, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true); + summon->SetDisplayId(11686); + summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + summon->CastSpell(target, DUNGEON_MODE(SPELL_SEARING_GAZE, H_SPELL_SEARING_GAZE), true); } } uiAbedneumEncounterTimer = 30000 + rand()%1000; @@ -400,11 +400,11 @@ public: } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - lDwarfGUIDList.push_back(pSummoned->GetGUID()); - pSummoned->AddThreat(me, 0.0f); - pSummoned->AI()->AttackStart(me); + lDwarfGUIDList.push_back(summoned->GetGUID()); + summoned->AddThreat(me, 0.0f); + summoned->AI()->AttackStart(me); } void JumpToNextStep(uint32 uiTimer) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 1d6a30b45ae..244c6a579a2 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -174,14 +174,14 @@ public: m_lCollapsingStarGUIDList.clear(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - if (pSummoned->GetEntry() == CREATURE_COLLAPSING_STAR) + if (summoned->GetEntry() == CREATURE_COLLAPSING_STAR) { Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (me->getVictim()) - pSummoned->AI()->AttackStart(target ? target : me->getVictim()); - m_lCollapsingStarGUIDList.push_back(pSummoned->GetGUID()); + summoned->AI()->AttackStart(target ? target : me->getVictim()); + m_lCollapsingStarGUIDList.push_back(summoned->GetGUID()); } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 0592c468bc0..eea405e57a4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -246,34 +246,34 @@ public: } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case CREATURE_GRAUF: - m_uiGraufGUID = pSummoned->GetGUID(); + m_uiGraufGUID = summoned->GetGUID(); break; case CREATURE_YMIRJAR_WARRIOR: case CREATURE_YMIRJAR_WITCH_DOCTOR: case CREATURE_YMIRJAR_HARPOONER: - pSummoned->setActive(true); - pSummoned->SetInCombatWithZone(); + summoned->setActive(true); + summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(target); + summoned->AI()->AttackStart(target); break; case CREATURE_TRIGGER: - pSummoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); - pSummoned->DespawnOrUnsummon(10*IN_MILLISECONDS); + summoned->CastSpell((Unit*)NULL, SPELL_FREEZING_CLOUD, true); + summoned->DespawnOrUnsummon(10*IN_MILLISECONDS); break; } - Summons.Summon(pSummoned); + Summons.Summon(summoned); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* summoned) { - if (pSummoned->GetEntry() == CREATURE_GRAUF) + if (summoned->GetEntry() == CREATURE_GRAUF) m_uiGraufGUID = 0; - Summons.Despawn(pSummoned); + Summons.Despawn(summoned); } void SpellHit(Unit* /*caster*/, const SpellEntry *spell) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 67a52b2e2b6..e5343e65711 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -358,8 +358,8 @@ public: pInstance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID()); for (uint8 i = 0; i < 3; ++i) - if (Creature* pSummon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) - pSummon->AI()->DoAction(0); + if (Creature* summon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) + summon->AI()->DoAction(0); } bSacrificed = true; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 2bd99764a1b..562a5930535 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -301,23 +301,23 @@ public: } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - if (pSummoned) + if (summoned) { - pSummoned->SetSpeed(MOVE_RUN, 0.3f); - pSummoned->GetMotionMaster()->MoveFollow(me, 0, 0); - m_waterElements.push_back(pSummoned->GetGUID()); - pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); + summoned->SetSpeed(MOVE_RUN, 0.3f); + summoned->GetMotionMaster()->MoveFollow(me, 0, 0); + m_waterElements.push_back(summoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); } } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* summoned) { - if (pSummoned) + if (summoned) { - m_waterElements.remove(pSummoned->GetGUID()); - pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); + m_waterElements.remove(summoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID()); } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 60629e2c3cb..1af9063a71b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -111,13 +111,13 @@ public: } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - pSummoned->SetSpeed(MOVE_RUN, 0.5f); + summoned->SetSpeed(MOVE_RUN, 0.5f); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - pSummoned->AddThreat(target, 0.00f); - pSummoned->AI()->AttackStart(target); + summoned->AddThreat(target, 0.00f); + summoned->AI()->AttackStart(target); } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 0fdd8c7b153..d7e57c813ea 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -656,18 +656,18 @@ public: pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - listOfMobs.Summon(pSummoned); - if (pSummoned) - pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); + listOfMobs.Summon(summoned); + if (summoned) + pInstance->SetData64(DATA_ADD_TRASH_MOB, summoned->GetGUID()); } - void SummonedMobDied(Creature* pSummoned) + void SummonedMobDied(Creature* summoned) { - listOfMobs.Despawn(pSummoned); - if (pSummoned) - pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); + listOfMobs.Despawn(summoned); + if (summoned) + pInstance->SetData64(DATA_DEL_TRASH_MOB, summoned->GetGUID()); } }; diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index b44db0d2987..8a1a8e3a7b9 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -1299,8 +1299,8 @@ public: return; if (me->isSummon()) - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->bArthasInPosition = true; } }; @@ -1331,8 +1331,8 @@ public: me->AddUnitState(UNIT_STAT_STUNNED); me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->bArlosInPosition = true; } }; @@ -1388,8 +1388,8 @@ public: return; if (me->isSummon()) - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(summoner)->AI())->bTalbotInPosition = true; } void UpdateAI(const uint32 uiDiff) @@ -1499,16 +1499,16 @@ public: me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI, pSummoner->GetAI())->bLeryssaInPosition = true; + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + CAST_AI(npc_thassarian::npc_thassarianAI, summoner->GetAI())->bLeryssaInPosition = true; bDone = true; } else { me->SetStandState(UNIT_STAND_STATE_SIT); if (me->isSummon()) - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - pSummoner->SetStandState(UNIT_STAND_STATE_SIT); + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + summoner->SetStandState(UNIT_STAND_STATE_SIT); uiPhaseTimer = 1500; Phase = 1; } diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index abec25530df..3885658beb1 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -172,12 +172,12 @@ public: bool Completed; - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { if (Creature* Mrfloppy = GetClosestCreatureWithEntry(me, NPC_MRFLOPPY, 50.0f)) - pSummoned->AI()->AttackStart(Mrfloppy); + summoned->AI()->AttackStart(Mrfloppy); else - pSummoned->AI()->AttackStart(me->getVictim()); + summoned->AI()->AttackStart(me->getVictim()); } void WaypointReached(uint32 i) diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1d98ca2b7a1..33884dc0cb6 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -383,15 +383,15 @@ public: SummonGladiator(NPC_FIRJUS); } - void JustSummoned(Creature* pSummon) + void JustSummoned(Creature* summon) { if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) { if (player->isAlive()) { - pSummon->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pSummon->GetMotionMaster()->MovePoint(0, afCenter[0], afCenter[1], afCenter[2]); - pSummon->AI()->AttackStart(player); + summon->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); + summon->GetMotionMaster()->MovePoint(0, afCenter[0], afCenter[1], afCenter[2]); + summon->AI()->AttackStart(player); return; } } @@ -404,12 +404,12 @@ public: me->SummonCreature(uiEntry, afSummon[0], afSummon[1], afSummon[2], 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30*IN_MILLISECONDS); } - void SummonedCreatureDies(Creature* pSummoned, Unit* /*killer*/) + void SummonedCreatureDies(Creature* summoned, Unit* /*killer*/) { uint32 uiEntry = 0; // will eventually reset the event if something goes wrong - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case NPC_FIRJUS: uiEntry = NPC_JLARBORN; break; case NPC_JLARBORN: uiEntry = NPC_YOROS; break; diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index e2a4ca470fc..ee36328e3e8 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -428,14 +428,14 @@ public: switch(uiPhase) { case 1: - if (Creature* pSummon = me->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - SummonGUID = pSummon->GetGUID(); + if (Creature* summon = me->SummonCreature(NPC_ORINOKO_TUSKBREAKER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + SummonGUID = summon->GetGUID(); uiPhase = 2; uiTimer = 4000; break; case 2: - if (Creature* pSummon = Unit::GetCreature(*me, SummonGUID)) - pSummon->GetMotionMaster()->MoveJump(5776.319824f, -2981.005371f, 273.100037f, 10.0f, 20.0f); + if (Creature* summon = Unit::GetCreature(*me, SummonGUID)) + summon->GetMotionMaster()->MoveJump(5776.319824f, -2981.005371f, 273.100037f, 10.0f, 20.0f); uiPhase = 0; SummonGUID = 0; break; @@ -445,8 +445,8 @@ public: uiPhase = 4; break; case 4: - if (Creature* pSummon = me->SummonCreature(NPC_KORRAK_BLOODRAGER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - SummonGUID = pSummon->GetGUID(); + if (Creature* summon = me->SummonCreature(NPC_KORRAK_BLOODRAGER, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + SummonGUID = summon->GetGUID(); uiTimer = 3000; uiPhase = 0; break; @@ -667,18 +667,18 @@ public: DoMeleeAttackIfReady(); } - void JustSummoned(Creature* pSummon) + void JustSummoned(Creature* summon) { - switch(pSummon->GetEntry()) + switch(summon->GetEntry()) { case NPC_WHISKER: - pSummon->AI()->AttackStart(me->getVictim()); + summon->AI()->AttackStart(me->getVictim()); break; case NPC_HUNGRY_PENGUIN: if (Unit* pAffected = Unit::GetUnit(*me, AffectedGUID)) { if (pAffected->isAlive()) - pSummon->AI()->AttackStart(pAffected); + summon->AI()->AttackStart(pAffected); } break; } @@ -869,10 +869,10 @@ public: void JustDied(Unit* killer) { - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) { std::string sText = (std::string(killer->GetName()) + " has defeated Yg.. Yggg-really big worm!"); - pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); + summoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) @@ -1074,10 +1074,10 @@ public: for (uint8 uiI = 0; uiI < 16 ; uiI++) { - if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd, AddSpawnPosition[uiI])) + if (Creature* summon = me->SummonCreature(Boss[uiBossRandom].uiAdd, AddSpawnPosition[uiI])) { - pSummon->AI()->SetData(1, uiBossRandom); - SummonList.push_back(pSummon->GetGUID()); + summon->AI()->SetData(1, uiBossRandom); + SummonList.push_back(summon->GetGUID()); } } @@ -1159,8 +1159,8 @@ public: std::string sText = (std::string(killer->GetName()) + " is victorious once more!"); - if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); + if (Unit* summoner = me->ToTempSummon()->GetSummoner()) + summoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; |