Apply #127.

Fix: Correct enum initialization phase value
Patch by Vladmimír Lipták

--HG--
branch : trunk

12 files changed, 25 insertions, 10 deletions

diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp
index 25e9753d8b5..dd8034d6d6e 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_faerlina.cpp
@@ -46,7 +46,8 @@ enum Spells
 
 enum Events
 {
-    EVENT_POISON = 1,
+    EVENT_NONE,
+    EVENT_POISON,
     EVENT_FIRE,
     EVENT_FRENZY,
     EVENT_AFTERENRAGE
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
index 0ed6b953866..a254bcfddb4 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_four_horsemen.cpp
@@ -27,7 +27,8 @@ enum Horsemen
 
 enum Events
 {
-    EVENT_MARK = 1,
+    EVENT_NONE,
+    EVENT_MARK,
     EVENT_CAST,
     EVENT_BERSERK,
 };
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
index 058261f9589..ad4e5e51db6 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gluth.cpp
@@ -34,7 +34,8 @@ const Position PosSummon[3] =
 
 enum Events
 {
-    EVENT_WOUND = 1,
+    EVENT_NONE,
+    EVENT_WOUND,
     EVENT_ENRAGE,
     EVENT_DECIMATE,
     EVENT_BERSERK,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
index b1e54501635..83b6bff7b95 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -108,7 +108,8 @@ const Waves wavesHeroic[] =
 
 enum Events
 {
-    EVENT_SUMMON = 1,
+    EVENT_NONE,
+    EVENT_SUMMON,
     EVENT_HARVEST,
     EVENT_BOLT,
 };
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp
index 53cb9895b2f..4b4ed343dcb 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_heigan.cpp
@@ -28,7 +28,8 @@
 
 enum Events
 {
-    EVENT_DISRUPT   = 1,
+    EVENT_NONE,
+    EVENT_DISRUPT,
     EVENT_FEVER,
     EVENT_ERUPT,
     EVENT_PHASE,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
index f95aa9e6e96..b0cbc6e7873 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_kelthuzad.cpp
@@ -56,6 +56,7 @@ enum Yells
 };
 enum Event
 {
+    EVENT_NONE,
     EVENT_BOLT,
     EVENT_NOVA,
     EVENT_CHAIN,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp
index 5b51719fd85..ea3edb5e2a7 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_loatheb.cpp
@@ -31,6 +31,7 @@ enum Spells
 
 enum Events
 {
+    EVENT_NONE,
     EVENT_AURA,
     EVENT_BLOOM,
     EVENT_DOOM,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
index 9b71a8063d5..cd337fd3b27 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_maexxna.cpp
@@ -38,7 +38,8 @@ const float PosWrap[MAX_POS_WRAP][3] =
 
 enum Events
 {
-    EVENT_SPRAY = 1,
+    EVENT_NONE,
+    EVENT_SPRAY,
     EVENT_SHOCK,
     EVENT_POISON,
     EVENT_WRAP,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
index 70dd411fba1..707c3049820 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_noth.cpp
@@ -52,7 +52,8 @@ const float SummonPos[MAX_SUMMON_POS][4] =
 
 enum Events
 {
-    EVENT_BERSERK   = 1,
+    EVENT_NONE,
+    EVENT_BERSERK,
     EVENT_CURSE,
     EVENT_BLINK,
     EVENT_WARRIOR,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp
index 040999bda6a..74a39947c69 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_razuvious.cpp
@@ -46,6 +46,7 @@
 
 enum Events
 {
+    EVENT_NONE,
     EVENT_STRIKE,
     EVENT_SHOUT,
     EVENT_KNIFE,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
index 00733c68032..6de3c89b61d 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_sapphiron.cpp
@@ -52,7 +52,8 @@ enum Phases
 
 enum Events
 {
-    EVENT_BERSERK   = 1,
+    EVENT_NONE,
+    EVENT_BERSERK,
     EVENT_CLEAVE,
     EVENT_TAIL,
     EVENT_DRAIN,
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
index 325841b30f4..c41e0464648 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_thaddius.cpp
@@ -77,7 +77,8 @@ enum ThaddiusSpells
 
 enum Events
 {
-    EVENT_SHIFT = 1,
+    EVENT_NONE,
+    EVENT_SHIFT,
     EVENT_CHAIN,
     EVENT_BERSERK,
 };
@@ -90,6 +91,7 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
     boss_thaddiusAI(Creature *c) : BossAI(c, BOSS_THADDIUS)
     {
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+        me->SetReactState(REACT_PASSIVE);
     }
 
     void KilledUnit(Unit* victim)
@@ -115,8 +117,10 @@ struct TRINITY_DLL_DECL boss_thaddiusAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-       if (CheckStalaggAlive == false && CheckFeugenAlive == false)
+       if (CheckStalaggAlive == false && CheckFeugenAlive == false) {
            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+           me->SetReactState(REACT_AGGRESSIVE);
+       }
 
        if (!UpdateVictim())
            return;