From db65e11d57fb52395a3ba2e9372bdaf29aca691c Mon Sep 17 00:00:00 2001 From: beeduck Date: Mon, 18 Jul 2016 13:10:00 -0700 Subject: Fixes for boat entities (#3265) protocol for vehicles now properly handled, protocol for boat paddles now properly handled, boats can no longer spawn underwater, boats now properly float, boat metadata now properly broadcasted. --- src/Entities/Boat.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'src/Entities/Boat.h') diff --git a/src/Entities/Boat.h b/src/Entities/Boat.h index d168f5072..5815ff88c 100644 --- a/src/Entities/Boat.h +++ b/src/Entities/Boat.h @@ -31,8 +31,29 @@ public: virtual void HandleSpeedFromAttachee(float a_Forward, float a_Sideways) override; cBoat(double a_X, double a_Y, double a_Z); -} ; + int GetLastDamage(void) const { return m_LastDamage; } + int GetForwardDirection(void) const { return m_ForwardDirection; } + + float GetDamageTaken(void) const { return m_DamageTaken; } + + int GetType(void) const { return m_Type; } + + bool IsRightPaddleUsed(void) const { return m_RightPaddleUsed; } + bool IsLeftPaddleUsed(void) const { return m_LeftPaddleUsed; } + void SetLastDamage(int TimeSinceLastHit); + void UpdatePaddles(bool rightPaddleUsed, bool leftPaddleUsed); +private: + int m_LastDamage; + int m_ForwardDirection; + + float m_DamageTaken; + + int m_Type; + + bool m_RightPaddleUsed; + bool m_LeftPaddleUsed; +} ; -- cgit v1.2.3