Both SetSpeed functions are now overridden by cPlayer
This commit is contained in:
parent
4aec5c9450
commit
5ef6c8fe72
@ -214,8 +214,14 @@ public:
|
|||||||
void SetYaw (double a_Yaw); // In degrees, normalizes to [-180, +180)
|
void SetYaw (double a_Yaw); // In degrees, normalizes to [-180, +180)
|
||||||
void SetPitch (double a_Pitch); // 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 SetRoll (double a_Roll); // In degrees, normalizes to [-180, +180)
|
||||||
void SetSpeed (double a_SpeedX, double a_SpeedY, double a_SpeedZ);
|
// tolua_end
|
||||||
void SetSpeed (const Vector3d & a_Speed) { SetSpeed(a_Speed.x, a_Speed.y, a_Speed.z); }
|
|
||||||
|
/** 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 SetSpeedX (double a_SpeedX);
|
||||||
void SetSpeedY (double a_SpeedY);
|
void SetSpeedY (double a_SpeedY);
|
||||||
void SetSpeedZ (double a_SpeedZ);
|
void SetSpeedZ (double a_SpeedZ);
|
||||||
@ -504,9 +510,6 @@ private:
|
|||||||
/** Measured in degrees, [-180, +180) */
|
/** Measured in degrees, [-180, +180) */
|
||||||
double m_HeadYaw;
|
double m_HeadYaw;
|
||||||
|
|
||||||
/** Measured in meter/second (m/s) */
|
|
||||||
Vector3d m_Speed;
|
|
||||||
|
|
||||||
/** Measured in degrees, [-180, +180) */
|
/** Measured in degrees, [-180, +180) */
|
||||||
Vector3d m_Rot;
|
Vector3d m_Rot;
|
||||||
|
|
||||||
|
@ -1252,6 +1252,26 @@ void cPlayer::ForceSetSpeed(const Vector3d & a_Speed)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cPlayer::SetSpeed(const Vector3d & a_Speed)
|
||||||
|
{
|
||||||
|
m_Speed.Set(a_Speed.x, a_Speed.y, a_Speed.z);
|
||||||
|
m_ClientHandle->SendEntityVelocity(*this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void cPlayer::SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ)
|
||||||
|
{
|
||||||
|
m_Speed.Set(a_SpeedX, a_SpeedY, a_SpeedZ);
|
||||||
|
m_ClientHandle->SendEntityVelocity(*this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cPlayer::MoveTo( const Vector3d & a_NewPos )
|
void cPlayer::MoveTo( const Vector3d & a_NewPos )
|
||||||
{
|
{
|
||||||
if ((a_NewPos.y < -990) && (GetPosY() > -100))
|
if ((a_NewPos.y < -990) && (GetPosY() > -100))
|
||||||
|
@ -191,9 +191,12 @@ public:
|
|||||||
// Sets the current gamemode, doesn't check validity, doesn't send update packets to client
|
// Sets the current gamemode, doesn't check validity, doesn't send update packets to client
|
||||||
void LoginSetGameMode(eGameMode a_GameMode);
|
void LoginSetGameMode(eGameMode a_GameMode);
|
||||||
|
|
||||||
/** Forces the player to move in the given direction. */
|
/** Forces the player to move in the given direction. DEPRECATED! Use SetSpeed instead */
|
||||||
void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export
|
void ForceSetSpeed(const Vector3d & a_Speed); // tolua_export
|
||||||
|
|
||||||
|
virtual void SetSpeed(const Vector3d & a_Speed) override;
|
||||||
|
virtual void SetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override
|
||||||
|
|
||||||
/** Tries to move to a new position, with attachment-related checks (y == -999) */
|
/** Tries to move to a new position, with attachment-related checks (y == -999) */
|
||||||
void MoveTo(const Vector3d & a_NewPos); // tolua_export
|
void MoveTo(const Vector3d & a_NewPos); // tolua_export
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user