aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-03-29 20:58:25 +0100
committerVincent-Michael <Vincent_Michael@gmx.de>2014-03-29 20:58:49 +0100
commit0b615ec159eb5cb969bac92206d059c529642d8f (patch)
tree42a080b5f6474280217bae1c82cf37437528fafc /src/server/scripts/Northrend
parentd3e292fe1ee70db857cd10700762fb6ccd75325d (diff)
Scripts/Misc: Small code optimizations
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp4
-rw-r--r--src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp2
-rw-r--r--src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp24
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp4
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp6
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp6
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp2
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp4
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_howling_fjord.cpp4
-rw-r--r--src/server/scripts/Northrend/zone_icecrown.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_sholazar_basin.cpp6
-rw-r--r--src/server/scripts/Northrend/zone_storm_peaks.cpp4
17 files changed, 39 insertions, 39 deletions
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 a60e69d6479..8b6cbb340e5 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
@@ -357,7 +357,7 @@ public:
if (instance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && instance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED)
{
if (instance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED)
- me->AI()->SetData(DATA_START, 0);
+ SetData(DATA_START, 0);
if (instance->GetData(BOSS_GRAND_CHAMPIONS) == DONE)
DoStartArgentChampionEncounter();
@@ -452,7 +452,7 @@ public:
case VEHICLE_ORGRIMMAR_WOLF:
case VEHICLE_SILVERMOON_HAWKSTRIDER:
case VEHICLE_DARKSPEAR_RAPTOR:
- me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED, 0);
+ SetData(DATA_LESSER_CHAMPIONS_DEFEATED, 0);
break;
}
}
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 09db3f89c26..f84f288d55a 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -231,7 +231,7 @@ public:
if (Creature* crystalChannelTarget = crystal->FindNearestCreature(NPC_CRYSTAL_CHANNEL_TARGET, 5.0f))
{
if (active)
- crystalChannelTarget->AI()->DoCastAOE(SPELL_BEAM_CHANNEL);
+ crystalChannelTarget->CastSpell((Unit*)NULL, SPELL_BEAM_CHANNEL);
else if (crystalChannelTarget->HasUnitState(UNIT_STATE_CASTING))
crystalChannelTarget->CastStop();
}
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 de14b930220..af459729eb8 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -891,7 +891,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
lichking->AI()->Talk(SAY_LK_ESCAPE_3);
- lichking->AI()->DoCast(me, SPELL_RAISE_DEAD);
+ lichking->CastSpell(me, SPELL_RAISE_DEAD);
lichking->Attack(me, true);
}
_events.ScheduleEvent(EVENT_ESCAPE_13, 4000);
@@ -899,15 +899,15 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
case EVENT_ESCAPE_13:
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
- lichking->AI()->DoCast(lichking, SPELL_REMORSELESS_WINTER, true);
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
+ lichking->CastSpell(lichking, SPELL_REMORSELESS_WINTER, true);
+ lichking->CastSpell(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
lichking->GetMotionMaster()->MoveIdle();
lichking->GetMotionMaster()->MoveChase(me);
}
if (Creature* walltarget = me->SummonCreature(NPC_ICE_WALL, IceWalls[0], TEMPSUMMON_MANUAL_DESPAWN, 720000))
{
_walltargetGUID = walltarget->GetGUID();
- walltarget->AI()->DoCast(walltarget, SPELL_SUMMON_ICE_WALL);
+ walltarget->CastSpell(walltarget, SPELL_SUMMON_ICE_WALL);
walltarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->Attack(walltarget, false);
}
@@ -948,7 +948,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
{
lichking->StopMoving();
lichking->AI()->Talk(SAY_LK_ESCAPE_3);
- lichking->AI()->DoCast(me, SPELL_RAISE_DEAD);
+ lichking->CastSpell(me, SPELL_RAISE_DEAD);
}
DestroyIceWall();
@@ -969,7 +969,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
if (_icewall && _icewall < 4)
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
+ lichking->CastSpell(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
lichking->GetMotionMaster()->MoveIdle();
lichking->GetMotionMaster()->MoveChase(me);
lichking->SetReactState(REACT_PASSIVE);
@@ -980,7 +980,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
if (Creature* walltarget = me->SummonCreature(NPC_ICE_WALL, IceWalls[_icewall], TEMPSUMMON_MANUAL_DESPAWN, 720000))
{
_walltargetGUID = walltarget->GetGUID();
- walltarget->AI()->DoCast(walltarget, SPELL_SUMMON_ICE_WALL);
+ walltarget->CastSpell(walltarget, SPELL_SUMMON_ICE_WALL);
walltarget->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
me->Attack(walltarget, false);
}
@@ -1018,9 +1018,9 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
if (_icewall && _icewall < 3)
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
+ lichking->CastSpell(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
else
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_LUMBERING_ABOMINATION);
+ lichking->CastSpell(lichking, SPELL_SUMMON_LUMBERING_ABOMINATION);
}
if (_icewall == 3)
_events.ScheduleEvent(EVENT_ESCAPE_21, 16000); // last wall, really far
@@ -1036,10 +1036,10 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
if (_icewall == 1)
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_LUMBERING_ABOMINATION);
+ lichking->CastSpell(lichking, SPELL_SUMMON_LUMBERING_ABOMINATION);
else if (_icewall > 1 && _icewall < 4)
{
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
+ lichking->CastSpell(lichking, SPELL_SUMMON_RISE_WITCH_DOCTOR);
_events.ScheduleEvent(EVENT_ESCAPE_22, 1000);
}
}
@@ -1048,7 +1048,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
if (_icewall >= 2 && _icewall < 4)
- lichking->AI()->DoCast(lichking, SPELL_SUMMON_LUMBERING_ABOMINATION);
+ lichking->CastSpell(lichking, SPELL_SUMMON_LUMBERING_ABOMINATION);
}
break;
case EVENT_ESCAPE_23: // FINAL PART
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index f05f2c20b12..6b81bcc46a5 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -545,7 +545,7 @@ class boss_lady_deathwhisper : public CreatureScript
void Summon(uint32 entry, const Position& pos)
{
if (TempSummon* summon = me->SummonCreature(entry, pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000))
- summon->AI()->DoCast(summon, SPELL_TELEPORT_VISUAL);
+ summon->CastSpell(summon, SPELL_TELEPORT_VISUAL);
}
void SetGUID(uint64 guid, int32 id/* = 0*/) OVERRIDE
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index 1df92618a3a..54a84158437 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -544,7 +544,7 @@ public:
break;
case PHASE_TWO:
events.ScheduleEvent(EVENT_MOVE_TO_POINT_SURGE_P_TWO, 60*IN_MILLISECONDS, 0, _phase);
- me->AI()->DoAction(ACTION_LIFT_IN_AIR);
+ DoAction(ACTION_LIFT_IN_AIR);
break;
case PHASE_THREE:
events.ScheduleEvent(EVENT_ARCANE_PULSE, 7*IN_MILLISECONDS, 0, _phase);
@@ -2325,7 +2325,7 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade
void ExecuteMainSpell()
{
- GetCaster()->ToCreature()->AI()->DoCastAOE(SPELL_SURGE_OF_POWER_PHASE_3_25);
+ GetCaster()->ToCreature()->CastSpell((Unit*)NULL, SPELL_SURGE_OF_POWER_PHASE_3_25);
}
void Register() OVERRIDE
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index cfa1b704c90..ee1524564a8 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -199,17 +199,17 @@ public:
if (summon->GetGUID() == uiFireMagusGUID)
{
- me->AI()->DoAction(ACTION_MAGUS_DEAD);
+ DoAction(ACTION_MAGUS_DEAD);
bFireMagusDead = true;
}
else if (summon->GetGUID() == uiFrostMagusGUID)
{
- me->AI()->DoAction(ACTION_MAGUS_DEAD);
+ DoAction(ACTION_MAGUS_DEAD);
bFrostMagusDead = true;
}
else if (summon->GetGUID() == uiArcaneMagusGUID)
{
- me->AI()->DoAction(ACTION_MAGUS_DEAD);
+ DoAction(ACTION_MAGUS_DEAD);
bArcaneMagusDead = true;
}
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index a809eb4ddff..63d498de5eb 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -364,7 +364,7 @@ class npc_sanctum_sentry : public CreatureScript
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
me->AddThreat(target, 100.0f);
- me->AI()->AttackStart(target);
+ AttackStart(target);
DoCast(target, SPELL_SAVAGE_POUNCE);
}
events.ScheduleEvent(EVENT_POUNCE, urand(12000, 17000));
@@ -430,7 +430,7 @@ class npc_feral_defender : public CreatureScript
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
me->AddThreat(target, 100.0f);
- me->AI()->AttackStart(target);
+ AttackStart(target);
DoCast(target, SPELL_FERAL_POUNCE);
}
events.ScheduleEvent(EVENT_FERAL_POUNCE, urand(10000, 12000));
@@ -439,7 +439,7 @@ class npc_feral_defender : public CreatureScript
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true))
{
me->AddThreat(target, 100.0f);
- me->AI()->AttackStart(target);
+ AttackStart(target);
DoCast(target, SPELL_FERAL_RUSH);
}
events.ScheduleEvent(EVENT_RUSH, urand(10000, 12000));
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index 64ee385b7fc..7f3e6485eaf 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -1069,7 +1069,7 @@ class npc_detonating_lasher : public CreatureScript
{
// Switching to other target - modify aggro of new target by 20% from current target's aggro
me->AddThreat(target, me->getThreatManager().getThreat(me->GetVictim(), false) * 1.2f);
- me->AI()->AttackStart(target);
+ AttackStart(target);
}
changeTargetTimer = urand(5000, 10000);
}
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 169a7085672..578a51fa1f8 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -455,7 +455,7 @@ class boss_hodir : public CreatureScript
if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (Aura* BitingColdAura = target->GetAura(SPELL_BITING_COLD_TRIGGERED))
if ((target->GetTypeId() == TYPEID_PLAYER) && (BitingColdAura->GetStackAmount() > 2))
- me->AI()->SetData(DATA_GETTING_COLD_IN_HERE, 0);
+ SetData(DATA_GETTING_COLD_IN_HERE, 0);
gettingColdInHereTimer = 1000;
}
else
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index e96cfaccc56..d1ed15bf8dd 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -211,8 +211,8 @@ class boss_razorscale_controller : public CreatureScript
Harpoon3->RemoveFromWorld();
if (GameObject* Harpoon4 = ObjectAccessor::GetGameObject(*me, instance->GetData64(GO_RAZOR_HARPOON_4)))
Harpoon4->RemoveFromWorld();
- me->AI()->DoAction(ACTION_HARPOON_BUILD);
- me->AI()->DoAction(ACTION_PLACE_BROKEN_HARPOON);
+ DoAction(ACTION_HARPOON_BUILD);
+ DoAction(ACTION_PLACE_BROKEN_HARPOON);
break;
case SPELL_HARPOON_SHOT_1:
case SPELL_HARPOON_SHOT_2:
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index b6438008dde..e9cf806118f 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -291,7 +291,7 @@ public:
m_uiCrushTimer = 8000;
m_uiPoisonedSpearTimer = 10000;
m_uiWhirlwindTimer = 20000;
- me->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM));
+ AttackStart(SelectTarget(SELECT_TARGET_RANDOM));
}
}
}
diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
index 6835228ca46..746680e32e6 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
@@ -189,7 +189,7 @@ public:
void JustSummoned(Creature* summon) OVERRIDE
{
summon->AI()->AttackStart(me->GetVictim());
- summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2);
+ summon->CastSpell((Unit*)NULL, SPELL_ZURAMAT_ADD_2);
summon->SetPhaseMask(17, true);
}
};
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index f7f473297ef..6ea4490c79d 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -2415,7 +2415,7 @@ public:
{
me->setFaction(14);
if (Player* player = ObjectAccessor::GetPlayer(*me, uiPlayerGUID))
- me->AI()->AttackStart(player);
+ AttackStart(player);
}
void UpdateAI(uint32 uiDiff) OVERRIDE
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 798801041f4..fd51237745e 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -458,10 +458,10 @@ class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader
if (!caster)
return;
- caster->AI()->DoCast(caster, SPELL_COSMETIC_BLOOD_EXPLOSION_GREEN_LARGE);
+ caster->CastSpell(caster, SPELL_COSMETIC_BLOOD_EXPLOSION_GREEN_LARGE);
for (uint8 i = 0; i < 10; ++i)
- caster->AI()->DoCast(caster, SPELL_RANDOM_CIRCUMFERENCE_POINT_POISON);
+ caster->CastSpell(caster, SPELL_RANDOM_CIRCUMFERENCE_POINT_POISON);
caster->DespawnOrUnsummon(4000);
}
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index f7894c58b3e..5284803c5f2 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -527,7 +527,7 @@ public:
{
me->setRegeneratingHealth(false);
DoCast(SPELL_THREAT_PULSE);
- me->AI()->Talk(BANNER_SAY);
+ Talk(BANNER_SAY);
events.ScheduleEvent(EVENT_SPAWN, 3000);
}
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index 0298500e790..6e39d341c58 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -1003,7 +1003,7 @@ enum ReconnaissanceFlight
VIC_SAY_6 = 6,
PLANE_EMOTE = 0,
- AURA_ENGINE = 52255, // Engine on Fire
+ SPELL_ENGINE = 52255, // Engine on Fire
SPELL_LAND = 52226, // Land Flying Machine
SPELL_CREDIT = 53328 // Land Flying Machine Credit
@@ -1054,8 +1054,8 @@ public:
pilot->AI()->Talk(VIC_SAY_6);
break;
case 25:
- me->AI()->Talk(PLANE_EMOTE);
- me->AI()->DoCast(AURA_ENGINE);
+ Talk(PLANE_EMOTE);
+ DoCast(SPELL_ENGINE);
break;
}
}
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index bd80de627a8..838fa44ded4 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -504,7 +504,7 @@ public:
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
if (Creature* voice = ObjectAccessor::GetCreature(*me, voiceGUID))
{
- voice->AI()->DoCast(voice, SPELL_RESURRECTION);
+ voice->CastSpell(voice, SPELL_RESURRECTION);
if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
voice->AI()->Talk(SAY_VOICE_1, player);
}
@@ -546,7 +546,7 @@ public:
break;
case EVENT_SCRIPT_9:
if (Creature* voice = ObjectAccessor::GetCreature(*me, voiceGUID))
- voice->AI()->DoCast(voice, SPELL_RESURRECTION);
+ voice->CastSpell(voice, SPELL_RESURRECTION);
events.ScheduleEvent(EVENT_SCRIPT_10, 6000);
break;
case EVENT_SCRIPT_10: