summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 0c393c0f5..0ea27ef10 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -214,8 +214,14 @@ 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);
- void SetSpeed (const Vector3d & a_Speed) { SetSpeed(a_Speed.x, a_Speed.y, a_Speed.z); }
+ // tolua_end
+
+ /** Measured in meter/second (m/s) */
+ Vector3d m_Speed;
+
+ // 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 SetSpeedX (double a_SpeedX);
void SetSpeedY (double a_SpeedY);
void SetSpeedZ (double a_SpeedZ);
@@ -504,9 +510,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;