summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-06-14 17:10:53 +0200
committermadmaxoft <github@xoft.cz>2014-06-14 17:10:53 +0200
commit3f009a7c9e35a08d5685cd4276e17fc8f3443f9e (patch)
tree2690eca907fe5d28ee3dcbabaedaacc21e23d8a1 /src/Entities/Player.cpp
parentMerge branch 'master' into cPlayerSetSpeed (diff)
downloadcuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.gz
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.bz2
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.lz
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.xz
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.tar.zst
cuberite-3f009a7c9e35a08d5685cd4276e17fc8f3443f9e.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.cpp58
1 files changed, 2 insertions, 56 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 33b339f8e..f1e0aad7e 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1257,30 +1257,15 @@ Vector3d cPlayer::GetThrowSpeed(double a_SpeedCoeff) const
void cPlayer::ForceSetSpeed(const Vector3d & a_Speed)
{
SetSpeed(a_Speed);
- m_ClientHandle->SendEntityVelocity(*this);
-}
-
-
-
-
-
-void cPlayer::SetSpeed(const Vector3d & a_Speed)
-{
- m_Speed.Set(a_Speed.x, a_Speed.y, a_Speed.z);
- WrapSpeed();
-
- // Send the speed to the client so he actualy moves
- m_ClientHandle->SendEntityVelocity(*this);
}
-void cPlayer::SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
+void cPlayer::DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
{
- m_Speed.Set(a_SpeedX, a_SpeedY, a_SpeedZ);
- WrapSpeed();
+ super::DoSetSpeed(a_SpeedX, a_SpeedY, a_SpeedZ);
// Send the speed to the client so he actualy moves
m_ClientHandle->SendEntityVelocity(*this);
@@ -1290,45 +1275,6 @@ void cPlayer::SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
-void cPlayer::SetSpeedX(double a_SpeedX)
-{
- m_Speed.x = a_SpeedX;
- WrapSpeed();
-
- // Send the speed to the client so he actualy moves
- m_ClientHandle->SendEntityVelocity(*this);
-}
-
-
-
-
-
-void cPlayer::SetSpeedY(double a_SpeedY)
-{
- m_Speed.y = a_SpeedY;
- WrapSpeed();
-
- // Send the speed to the client so he actualy moves
- m_ClientHandle->SendEntityVelocity(*this);
-}
-
-
-
-
-
-void cPlayer::SetSpeedZ(double a_SpeedZ)
-{
- m_Speed.z = a_SpeedZ;
- WrapSpeed();
-
- // Send the speed to the client so he actualy moves
- m_ClientHandle->SendEntityVelocity(*this);
-}
-
-
-
-
-
void cPlayer::MoveTo( const Vector3d & a_NewPos )
{
if ((a_NewPos.y < -990) && (GetPosY() > -100))