From 4774323154a2d07c656ee477c7424440ef3914ef Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 3 Oct 2014 22:23:56 +0100 Subject: More player speed/position overrides * Fixes #1300 --- src/Entities/Player.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/Entities/Player.h') diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 22d6a2ae2..556a118b5 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -201,10 +201,6 @@ public: // Sets the current gamemode, doesn't check validity, doesn't send update packets to client void LoginSetGameMode(eGameMode a_GameMode); - /** Forces the player to move in the given direction. - @deprecated Use SetSpeed instead. */ - void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export - /** Tries to move to a new position, with attachment-related checks (y == -999) */ void MoveTo(const Vector3d & a_NewPos); // tolua_export @@ -585,7 +581,16 @@ protected: AString m_CustomName; /** Sets the speed and sends it to the client, so that they are forced to move so. */ - virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override; + virtual void SetSpeed(const Vector3d & a_Speed) override; + + /** Adds to the speed and sends it to the client, so that they are forced to move so. */ + virtual void AddSpeed(const Vector3d & a_Speed) override; + + /** Sets the speed and sends it to the client, so that they are forced to move so. */ + virtual void SetPosition(const Vector3d & a_Position) override; + + /** Adds to the speed and sends it to the client, so that they are forced to move so. */ + virtual void AddPosition(const Vector3d & a_Position) override; void ResolvePermissions(void); void ResolveGroups(void); -- cgit v1.2.3