aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorMalcrom <malcromdev@gmail.com>2013-01-07 21:47:38 -0330
committerMalcrom <malcromdev@gmail.com>2013-01-07 21:47:38 -0330
commit0105bc849fd062d2a8a8110e6c3cfefb70da0e16 (patch)
tree3096186ef36cb5206b046134ec9e85d796eba764 /src/server/scripts/Northrend
parent6ba128b2b2bc60d0f4afd41f0316dcaf7dce2bae (diff)
Core/Scripting: Misc clean up and a warning fix
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp2
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index 0208edebef5..8f77cc7ec6f 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -57,7 +57,7 @@ enum Yells
SAY_SLAY = 3,
SAY_DEATH = 4,
SAY_FEED = 5,
- SAY_VANISH = 6,
+ SAY_VANISH = 6
};
enum CombatPhase
{
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index 95830916abd..05bf7b9794a 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -25,7 +25,7 @@
#include "Vehicle.h"
#include "GridNotifiers.h"
-enum ScriptTexts
+enum Say
{
// Festergut
SAY_FESTERGUT_GASEOUS_BLIGHT = 0,
@@ -45,7 +45,7 @@ enum ScriptTexts
EMOTE_CHOKING_GAS_BOMB = 10,
SAY_KILL = 11,
SAY_BERSERK = 12,
- SAY_DEATH = 13,
+ SAY_DEATH = 13
};
enum Spells
@@ -135,7 +135,7 @@ enum Events
EVENT_CHOKING_GAS_BOMB = 12,
EVENT_UNBOUND_PLAGUE = 13,
EVENT_MUTATED_PLAGUE = 14,
- EVENT_PHASE_TRANSITION = 15,
+ EVENT_PHASE_TRANSITION = 15
};
enum Phases
@@ -148,14 +148,14 @@ enum Phases
PHASE_COMBAT_3 = 6,
PHASE_MASK_COMBAT = (1 << PHASE_COMBAT_1) | (1 << PHASE_COMBAT_2) | (1 << PHASE_COMBAT_3),
- PHASE_MASK_NOT_SELF = (1 << PHASE_FESTERGUT) | (1 << PHASE_ROTFACE),
+ PHASE_MASK_NOT_SELF = (1 << PHASE_FESTERGUT) | (1 << PHASE_ROTFACE)
};
enum Points
{
POINT_FESTERGUT = 366260,
POINT_ROTFACE = 366270,
- POINT_TABLE = 366780,
+ POINT_TABLE = 366780
};
Position const festergutWatchPos = {4324.820f, 3166.03f, 389.3831f, 3.316126f}; //emote 432 (release gas)
@@ -169,7 +169,7 @@ enum PutricideData
{
DATA_EXPERIMENT_STAGE = 1,
DATA_PHASE = 2,
- DATA_ABOMINATION = 3,
+ DATA_ABOMINATION = 3
};
#define EXPERIMENT_STATE_OOZE false