*Cleanup of charm/farsight code. Hope this can fix some crash bugs.

--HG-- branch : trunk
2009-02-15 17:33:36 -06:00
parent 058b7c32e4
commit bb75ff7b79
10 changed files with 41 additions and 130 deletions
@@ -899,17 +899,11 @@ class TRINITY_DLL_SPEC Player : public Unit
        void RemoveFromWorld();

        void SetViewport(uint64 guid, bool movable);
-        void RemovePossess(bool attack = true);
-        void StopCharmOrPossess()
-        {
-            if(isPossessing())
-                RemovePossess(true);
-            else if(GetCharm())
-                Uncharm();
-        }
+        void StopCastingCharm() { Uncharm(); }
+        void StopBindSight();
        WorldObject* GetFarsightTarget() const;
        void ClearFarsight();
-        void RemoveFarsightTarget();
+        void StopCastingBindSight();
        void SetFarsightTarget(WorldObject* target);
        // Controls if vision is currently on farsight object, updated in FAR_SIGHT opcode
        void SetFarsightVision(bool apply) { m_farsightVision = apply; }