*Merge.

--HG--
branch : trunk

1 files changed, 3 insertions, 0 deletions

diff --git a/src/game/Unit.h b/src/game/Unit.h
index 1f40b748fb6..cae075b07dc 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1214,6 +1214,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         CharmInfo* GetCharmInfo() { return m_charmInfo; }
         CharmInfo* InitCharmInfo();
         void       DeleteCharmInfo();
+        void UpdateCharmAI();
         SharedVisionList const& GetSharedVisionList() { return m_sharedVision; }
         void AddPlayerToVision(Player* plr);
         void RemovePlayerFromVision(Player* plr);
@@ -1549,6 +1550,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
     protected:
         explicit Unit ();
 
+        UnitAI *i_AI, *i_disabledAI;
+
         void _UpdateSpells(uint32 time);
 
         void _UpdateAutoRepeatSpell();