Merge fixups

1 files changed, 0 insertions, 37 deletions

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 870f7a13754..12e80339ce6 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -30,33 +30,11 @@ enum Says
     SAY_DEATH               = 6
 };
 
-enum Spells
-{
-};
-
-enum Events
-{
-};
-
-enum Events
-{
-    EVENT_STATIC_DISRUPTION     = 1,
-    EVENT_GUST_OF_WIND          = 2,
-    EVENT_CALL_LIGHTNING        = 3,
-    EVENT_ELECTRICAL_STORM      = 4,
-    EVENT_RAIN                  = 5,
-    EVENT_SUMMON_EAGLES         = 6,
-    EVENT_STORM_SEQUENCE        = 7,
-    EVENT_ENRAGE                = 8
-};
-
 class boss_akilzon : public CreatureScript
 {
     public:
         boss_akilzon() : CreatureScript("boss_akilzon") { }
 
-        boss_akilzon() : CreatureScript("boss_akilzon") { }
-
         struct boss_akilzonAI : public BossAI
         {
             boss_akilzonAI(Creature* creature) : BossAI(creature, DATA_AKILZON) { }
@@ -68,13 +46,6 @@ class boss_akilzon : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                events.ScheduleEvent(EVENT_STATIC_DISRUPTION, urand(10000, 20000)); // 10 to 20 seconds (bosskillers)
-                events.ScheduleEvent(EVENT_GUST_OF_WIND, urand(20000, 30000));      // 20 to 30 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_CALL_LIGHTNING, urand(10000, 20000));    // totaly random timer. can't find any info on this
-                events.ScheduleEvent(EVENT_ELECTRICAL_STORM, 60000);                // 60 seconds(bosskillers)
-                events.ScheduleEvent(EVENT_RAIN, urand(47000, 52000));
-                events.ScheduleEvent(EVENT_ENRAGE, 10*MINUTE*IN_MILLISECONDS);      // 10 minutes till enrage(bosskillers)
-
                 Talk(SAY_AGGRO);
                 _EnterCombat();
             }
@@ -113,14 +84,6 @@ class boss_akilzon : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-
-            private:
-                uint64 BirdGUIDs[8];
-                uint64 TargetGUID;
-                uint64 CycloneGUID;
-                uint64 CloudGUID;
-                uint8  StormCount;
-                bool   isRaining;
         };
 
         CreatureAI* GetAI(Creature* creature) const