summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.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/Entity.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 'src/Entities/Entity.cpp')
-rw-r--r--src/Entities/Entity.cpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 8f736a269..76bd11406 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1076,6 +1076,17 @@ void cEntity::SetSwimState(cChunk & a_Chunk)
+void cEntity::DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
+{
+ m_Speed.Set(a_SpeedX, a_SpeedY, a_SpeedZ);
+
+ WrapSpeed();
+}
+
+
+
+
+
void cEntity::HandleAir(void)
{
// Ref.: http://www.minecraftwiki.net/wiki/Chunk_format
@@ -1428,9 +1439,7 @@ void cEntity::SetRoll(double a_Roll)
void cEntity::SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
{
- m_Speed.Set(a_SpeedX, a_SpeedY, a_SpeedZ);
-
- WrapSpeed();
+ DoSetSpeed(a_SpeedX, a_SpeedY, a_SpeedZ);
}
@@ -1438,9 +1447,7 @@ void cEntity::SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
void cEntity::SetSpeedX(double a_SpeedX)
{
- m_Speed.x = a_SpeedX;
-
- WrapSpeed();
+ SetSpeed(a_SpeedX, m_Speed.y, m_Speed.z);
}
@@ -1448,9 +1455,7 @@ void cEntity::SetSpeedX(double a_SpeedX)
void cEntity::SetSpeedY(double a_SpeedY)
{
- m_Speed.y = a_SpeedY;
-
- WrapSpeed();
+ SetSpeed(m_Speed.x, a_SpeedY, m_Speed.z);
}
@@ -1458,9 +1463,7 @@ void cEntity::SetSpeedY(double a_SpeedY)
void cEntity::SetSpeedZ(double a_SpeedZ)
{
- m_Speed.z = a_SpeedZ;
-
- WrapSpeed();
+ SetSpeed(m_Speed.x, m_Speed.y, a_SpeedZ);
}