diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
5 files changed, 16 insertions, 16 deletions
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index e8d7af383e5..3fedbeb583c 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -197,22 +197,22 @@ public: Summons.DespawnAll(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - pSummoned->SetInCombatWithZone(); + summoned->SetInCombatWithZone(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) - pSummoned->AI()->AttackStart(target); + summoned->AI()->AttackStart(target); - switch (pSummoned->GetEntry()) + switch (summoned->GetEntry()) { case NPC_WHELP: ++m_uiSummonWhelpCount; break; case NPC_LAIRGUARD: - pSummoned->setActive(true); + summoned->setActive(true); break; } - Summons.Summon(pSummoned); + Summons.Summon(summoned); } void SummonedCreatureDespawn(Creature* summon) diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index abe8e7e8166..738c4761bc2 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -162,8 +162,8 @@ public: { for (uint8 i = 0; i < uiSummonTimes; ++i) { - if (Creature* pSummon = go->SummonCreature(uiCreature, 2502.635f + float(irand(-5, 5)), 844.140f + float(irand(-5, 5)), 46.896f, 0.633f)) - pSummon->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); + if (Creature* summon = go->SummonCreature(uiCreature, 2502.635f + float(irand(-5, 5)), 844.140f + float(irand(-5, 5)), 46.896f, 0.633f)) + summon->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } } creature->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 356083cf554..da38e26fd22 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -310,9 +310,9 @@ class npc_muglash : public CreatureScript uint32 m_uiEventTimer; bool m_bIsBrazierExtinguished; - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - pSummoned->AI()->AttackStart(me); + summoned->AI()->AttackStart(me); } void WaypointReached(uint32 i) diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index a71896e95d5..a94c98823be 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -637,13 +637,13 @@ public: } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - if (pSummoned->GetEntry() == NPC_PILOT_WIZZ) + if (summoned->GetEntry() == NPC_PILOT_WIZZ) me->SetStandState(UNIT_STAND_STATE_DEAD); - if (pSummoned->GetEntry() == NPC_MERCENARY) - pSummoned->AI()->AttackStart(me); + if (summoned->GetEntry() == NPC_MERCENARY) + summoned->AI()->AttackStart(me); } void UpdateEscortAI(const uint32 uiDiff) diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 505a6d2597b..fdff6309be3 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -98,9 +98,9 @@ public: TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* summoned) { - pSummoned->AI()->AttackStart(me); + summoned->AI()->AttackStart(me); } }; |