Merge branch 'main' of github.com:ProjectSkyfire/SkyFire_548

ProjectSkyfire · Oct 29, 2023 · a4dfcfd · a4dfcfd
2 parents 2f9de76 + e33423f
commit a4dfcfd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
@@ -140,7 +140,9 @@ class CreatureAI : public UnitAI
         //virtual void AttackStart(Unit*) { }
 
         // Called at World update tick
-        //virtual void UpdateAI(const uint32 /*diff*/) { }
+        virtual void UpdateAI(const uint32 /*diff*/) { }
+
+        virtual void ExecuteEvent(uint32 /*eventId*/) { }
 
         /// == State checks =================================
 

diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
@@ -147,6 +147,8 @@ struct ScriptedAI : public CreatureAI
     //Called at World update tick
     void UpdateAI(uint32 diff) OVERRIDE;
 
+    void ExecuteEvent(uint32 /*eventId*/) OVERRIDE { }
+
     //Called at creature death
     void JustDied(Unit* /*killer*/) OVERRIDE { }
 
@@ -384,31 +386,30 @@ class BossAI : public ScriptedAI
         return _boundary;
     }
 
-    void JustSummoned(Creature* summon);
-    void SummonedCreatureDespawn(Creature* summon);
+    void JustSummoned(Creature* summon) OVERRIDE;
+    void SummonedCreatureDespawn(Creature* summon) OVERRIDE;
 
-    virtual void UpdateAI(uint32 diff);
+    void UpdateAI(uint32 diff) OVERRIDE;
 
     // Hook used to execute events scheduled into EventMap without the need
     // to override UpdateAI
     // note: You must re-schedule the event within this method if the event
     // is supposed to run more than once
-    virtual void ExecuteEvent(uint32 /*eventId*/)
-    { }
+    void ExecuteEvent(uint32 /*eventId*/) OVERRIDE { }
 
-    void Reset()
+    void Reset() OVERRIDE
     {
         _Reset();
     }
-    void EnterCombat(Unit* /*who*/)
+    void EnterCombat(Unit* /*who*/) OVERRIDE
     {
         _EnterCombat();
     }
-    void JustDied(Unit* /*killer*/)
+    void JustDied(Unit* /*killer*/) OVERRIDE
     {
         _JustDied();
     }
-    void JustReachedHome()
+    void JustReachedHome() OVERRIDE
     {
         _JustReachedHome();
     }
@@ -453,14 +454,13 @@ class WorldBossAI : public ScriptedAI
     void JustSummoned(Creature* summon);
     void SummonedCreatureDespawn(Creature* summon);
 
-    virtual void UpdateAI(uint32 diff);
+    void UpdateAI(uint32 diff) OVERRIDE;
 
     // Hook used to execute events scheduled into EventMap without the need
     // to override UpdateAI
     // note: You must re-schedule the event within this method if the event
     // is supposed to run more than once
-    virtual void ExecuteEvent(uint32 /*eventId*/)
-    { }
+    void ExecuteEvent(uint32 /*eventId*/) OVERRIDE { }
 
     void Reset()
     {