*Merge.

--HG--
branch : trunk

2 files changed, 7 insertions, 0 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index fa82c3b1eac..049218cca86 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -612,6 +612,7 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
     i_AI = ai ? ai : FactorySelector::selectAI(this);
     if(oldAI) delete oldAI;
     IsAIEnabled = true;
+    i_AI->Reset();
     return true;
 }
 
diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
index a15ae59a0ad..7388aab786c 100644
--- a/src/game/CreatureAI.h
+++ b/src/game/CreatureAI.h
@@ -79,9 +79,15 @@ class TRINITY_DLL_SPEC UnitAI
         virtual void AttackStart(Unit *);
         virtual void UpdateAI(const uint32 diff) = 0;
 
+        // Initialize
+        virtual void Reset() {};
+
         // Called when unit is charmed
         virtual void OnCharmed(bool apply) = 0;
 
+        // Pass parameters between AI
+        virtual void DoAction(const int32 param) {}
+
         //Do melee swing of current victim if in rnage and ready and not casting
         void DoMeleeAttackIfReady();
 };