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

--HG--
branch : trunk

1 files changed, 3 insertions, 9 deletions

diff --git a/src/game/Player.h b/src/game/Player.h
index a149e559a3a..7137738d20d 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -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; }