*Merge.

--HG-- branch : trunk
2009-01-09 16:43:23 -06:00
parent 5c8f52d134 90a82a81ad
commit 1ffb1cef33
66 changed files with 1270 additions and 621 deletions
@@ -962,8 +962,14 @@ class TRINITY_DLL_SPEC Player : public Unit
        void RemoveFromWorld();

        void SetViewport(uint64 guid, bool movable);
-        void Possess(Unit *target);
-        void RemovePossess(bool attack = true); 
+        void RemovePossess(bool attack = true);
+        void StopCharmOrPossess()
+        {
+            if(isPossessing())
+                RemovePossess(true);
+            else if(GetCharm())
+                Uncharm();
+        }
        WorldObject* GetFarsightTarget() const;
        void ClearFarsight();
        void RemoveFarsightTarget();
@@ -2430,6 +2436,7 @@ class TRINITY_DLL_SPEC Player : public Unit
        MapReference m_mapRef;

        void UpdateCharmedAI();
+        UnitAI *i_AI;
 };

 void AddItemsSetItem(Player*player,Item *item);