summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Entities/Entity.h')
-rw-r--r--src/Entities/Entity.h24
1 files changed, 17 insertions, 7 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 85ad42d54..fed856b30 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -215,11 +215,24 @@ public:
void SetYaw (double a_Yaw); // In degrees, normalizes to [-180, +180)
void SetPitch (double a_Pitch); // In degrees, normalizes to [-180, +180)
void SetRoll (double a_Roll); // In degrees, normalizes to [-180, +180)
- void SetSpeed (double a_SpeedX, double a_SpeedY, double a_SpeedZ);
+ // tolua_end
+
+ /** Measured in meter/second (m/s) */
+ Vector3d m_Speed;
+
+ // tolua_begin
+ /** Sets the speed of the entity and moves them in the given speed. */
+ virtual void SetSpeed (double a_SpeedX, double a_SpeedY, double a_SpeedZ);
+ /** Sets the speed of the entity and moves them in the given speed. */
void SetSpeed (const Vector3d & a_Speed) { SetSpeed(a_Speed.x, a_Speed.y, a_Speed.z); }
- void SetSpeedX (double a_SpeedX);
- void SetSpeedY (double a_SpeedY);
- void SetSpeedZ (double a_SpeedZ);
+
+ /** Sets the speed for the X axis */
+ virtual void SetSpeedX (double a_SpeedX);
+ /** Sets the speed for the Y axis */
+ virtual void SetSpeedY (double a_SpeedY);
+ /** Sets the speed for the Z axis */
+ virtual void SetSpeedZ (double a_SpeedZ);
+
void SetWidth (double a_Width);
void AddPosX (double a_AddPosX);
@@ -506,9 +519,6 @@ private:
/** Measured in degrees, [-180, +180) */
double m_HeadYaw;
- /** Measured in meter/second (m/s) */
- Vector3d m_Speed;
-
/** Measured in degrees, [-180, +180) */
Vector3d m_Rot;