Core/Scripts: Merged ZoneScript::ProcessEvent methods into one accepting WorldObject* parameter

5 files changed, 8 insertions, 22 deletions

diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h
index b30e7a97ba6..ec3520fa728 100755
--- a/src/server/game/Maps/ZoneScript.h
+++ b/src/server/game/Maps/ZoneScript.h
@@ -21,8 +21,6 @@
 #include "Common.h"
 #include "Creature.h"
 
-//struct CreatureData;
-class Creature;
 class GameObject;
 
 class ZoneScript
@@ -49,8 +47,7 @@ class ZoneScript
         virtual uint32 GetData(uint32 /*DataId*/) { return 0; }
         virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {}
 
-        virtual void ProcessEvent(GameObject* /*obj*/, uint32 /*eventId*/) {}
-        virtual void ProcessEvent(Unit* /*unit*/, uint32 /*eventId*/) {}
+        virtual void ProcessEvent(WorldObject* /*obj*/, uint32 /*eventId*/) {}
 };
 
 #endif
\ No newline at end of file
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index 8c03731e130..09fe37d140c 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -138,11 +138,13 @@ public:
             }
         }
 
-        void ProcessEvent(GameObject* go, uint32 eventId)
+        void ProcessEvent(WorldObject* obj, uint32 eventId)
         {
             if (eventId == EVENT_FOCUSING_IRIS)
             {
-                go->Delete(); // this is not the best way.
+                if (GameObject* go = obj->ToGameObject())
+                    go->Delete(); // this is not the best way.
+
                 if (Creature* malygos = instance->GetCreature(malygosGUID))
                     malygos->GetMotionMaster()->MovePoint(4, 770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE
 
@@ -151,11 +153,6 @@ public:
             }
         }
 
-        // eliminate compile warning
-        void ProcessEvent(Unit* /*unit*/, uint32 /*eventId*/)
-        {
-        }
-
         void VortexHandling()
         {
             if (Creature* malygos = instance->GetCreature(malygosGUID))
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 412a30abb3b..14acfbec03d 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -83,11 +83,7 @@ public:
             }
         }
 
-        void ProcessEvent(GameObject* /*go*/, uint32 /*eventId*/)
-        {
-        }
-
-        void ProcessEvent(Unit* /*unit*/, uint32 eventId)
+        void ProcessEvent(WorldObject* /*unit*/, uint32 eventId)
         {
             if (eventId != EVENT_CALL_DRAGON)
                 return;
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 5ec29a0f78d..cb250adc01a 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -382,7 +382,7 @@ class instance_ulduar : public InstanceMapScript
                 }
             }
 
-            void ProcessEvent(GameObject* /*gameObject*/, uint32 eventId)
+            void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId)
             {
                 // Flame Leviathan's Tower Event triggers
                 Creature* FlameLeviathan = instance->GetCreature(LeviathanGUID);
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 7e6e777c0c2..f4e1489c8ce 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -795,7 +795,7 @@ public:
             }
         }
 
-        void ProcessEvent(GameObject* /*pGO*/, uint32 uiEventId)
+        void ProcessEvent(WorldObject* /*pGO*/, uint32 uiEventId)
         {
             switch (uiEventId)
             {
@@ -805,10 +805,6 @@ public:
                     break;
             }
         }
-
-        void ProcessEvent(Unit* /*unit*/, uint32 /*eventId*/)
-        {
-        }
     };
 };