aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-07-15 01:07:02 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-07-15 01:07:02 +0200
commitbaeecba6c9e3a2b9d4e98551b9746d27016305a2 (patch)
tree02830533554815203cfd4500a863e092090aad36
parent08c1a8109636f3bdb9c41d0c1691c098d27fbc2d (diff)
Core: Fix build
-rw-r--r--src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp2
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp4
-rw-r--r--src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp21
3 files changed, 9 insertions, 18 deletions
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 aee82529ed7..b590b963c34 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -318,6 +318,7 @@ class boss_lich_king_toc : public CreatureScript
_instance->SetData(TYPE_EVENT, 5080);
break;
case 5080:
+ {
if (GameObject* go = GameObject::GetGameObject(*me, _instance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
{
go->SetDisplayId(DISPLAYID_DESTROYED_FLOOR);
@@ -338,6 +339,7 @@ class boss_lich_king_toc : public CreatureScript
me->DespawnOrUnsummon();
_updateTimer = 20*IN_MILLISECONDS;
break;
+ }
default:
break;
}
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index d86c9a2afe7..4a4304bcd24 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -72,7 +72,7 @@ enum Spells
// Ashtongue Spiritbinder
SPELL_SPIRIT_MEND = 42025,
SPELL_CHAIN_HEAL = 42027,
- SPELL_SPIRIT_HEAL = 42317
+ SPELL_SPIRITBINDER_SPIRIT_HEAL = 42317
};
enum Creatures
@@ -1189,7 +1189,7 @@ public:
switch (eventId)
{
case EVENT_SPIRIT_HEAL:
- DoCast(me, SPELL_SPIRIT_HEAL);
+ DoCast(me, SPELL_SPIRITBINDER_SPIRIT_HEAL);
events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (13000, 16000));
break;
default:
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 389634a50bf..09fb235edb9 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -75,11 +75,8 @@ enum WaitEventType
class boss_alar : public CreatureScript
{
public:
+ boss_alar() : CreatureScript("boss_alar") { }
- boss_alar()
- : CreatureScript("boss_alar")
- {
- }
struct boss_alarAI : public ScriptedAI
{
boss_alarAI(Creature* creature) : ScriptedAI(creature)
@@ -162,7 +159,6 @@ class boss_alar : public CreatureScript
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
-
void AttackStart(Unit* who) OVERRIDE
{
if (Phase1)
@@ -462,11 +458,7 @@ class boss_alar : public CreatureScript
class npc_ember_of_alar : public CreatureScript
{
public:
-
- npc_ember_of_alar()
- : CreatureScript("npc_ember_of_alar")
- {
- }
+ npc_ember_of_alar() : CreatureScript("npc_ember_of_alar") { }
struct npc_ember_of_alarAI : public ScriptedAI
{
@@ -484,10 +476,12 @@ class npc_ember_of_alar : public CreatureScript
{
toDie = false;
}
+
void EnterCombat(Unit* /*who*/) OVERRIDE
{
DoZoneInCombat();
}
+
void EnterEvadeMode() OVERRIDE
{
me->setDeathState(JUST_DIED);
@@ -541,11 +535,7 @@ class npc_ember_of_alar : public CreatureScript
class npc_flame_patch_alar : public CreatureScript
{
public:
-
- npc_flame_patch_alar()
- : CreatureScript("npc_flame_patch_alar")
- {
- }
+ npc_flame_patch_alar() : CreatureScript("npc_flame_patch_alar") { }
struct npc_flame_patch_alarAI : public ScriptedAI
{
@@ -570,4 +560,3 @@ void AddSC_boss_alar()
new npc_ember_of_alar();
new npc_flame_patch_alar();
}
-