summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-05-22 11:46:38 +0200
committerSTRWarrior <niels.breuker@hotmail.nl>2014-05-22 11:46:38 +0200
commit592a0b6147f359fd9d12a28c9c43c208d84b5b3f (patch)
treecf45502f7a93170d748fa5c4678000e9de129e11 /src
parentcPlayer overrides the SetSpeedXX functions (diff)
downloadcuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.tar
cuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.tar.gz
cuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.tar.bz2
cuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.tar.lz
cuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.tar.xz
cuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.tar.zst
cuberite-592a0b6147f359fd9d12a28c9c43c208d84b5b3f.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h2
-rw-r--r--src/Entities/Player.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index fc72462c3..ed67465a3 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -221,7 +221,7 @@ public:
// tolua_begin
virtual void SetSpeed (double a_SpeedX, double a_SpeedY, double a_SpeedZ);
- virtual void SetSpeed (const Vector3d & a_Speed) { SetSpeed(a_Speed.x, a_Speed.y, a_Speed.z); }
+ void SetSpeed (const Vector3d & a_Speed) { SetSpeed(a_Speed.x, a_Speed.y, a_Speed.z); }
virtual void SetSpeedX (double a_SpeedX);
virtual void SetSpeedY (double a_SpeedY);
virtual void SetSpeedZ (double a_SpeedZ);
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index fb6bdc3ee..ee91beb4b 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -194,7 +194,7 @@ public:
/** Forces the player to move in the given direction. DEPRECATED! Use SetSpeed instead */
void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export
- virtual void SetSpeed(const Vector3d & a_Speed) override;
+ void SetSpeed(const Vector3d & a_Speed);
virtual void SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override;
virtual void SetSpeedX(double a_SpeedX) override;