diff options
author | madmaxoft <github@xoft.cz> | 2013-10-13 18:26:45 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2013-10-13 18:26:45 +0200 |
commit | e62cac07c0d74ded6109b9221045d65223b05c23 (patch) | |
tree | a1011589b593aa387a434501b40fb99de0d0a502 /source/Entities/Minecart.h | |
parent | Merge pull request #226 from SamJBarney/master (diff) | |
parent | Eight round of fixes (diff) | |
download | cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.gz cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.bz2 cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.lz cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.xz cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.tar.zst cuberite-e62cac07c0d74ded6109b9221045d65223b05c23.zip |
Diffstat (limited to '')
-rw-r--r-- | source/Entities/Minecart.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source/Entities/Minecart.h b/source/Entities/Minecart.h index 0152f5dfc..b1b48be4e 100644 --- a/source/Entities/Minecart.h +++ b/source/Entities/Minecart.h @@ -50,16 +50,19 @@ public: // cEntity overrides: virtual void SpawnOn(cClientHandle & a_ClientHandle) override; virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override; - void HandleRailPhysics(float a_Dt, cChunk & a_Chunk); virtual void DoTakeDamage(TakeDamageInfo & TDI) override; - + int LastDamage(void) const { return m_LastDamage; } + void HandleRailPhysics(float a_Dt, cChunk & a_Chunk); ePayload GetPayload(void) const { return m_Payload; } protected: ePayload m_Payload; cMinecart(ePayload a_Payload, double a_X, double a_Y, double a_Z); + + int m_LastDamage; + } ; @@ -127,6 +130,12 @@ public: // cEntity overrides: virtual void OnRightClicked(cPlayer & a_Player) override; + bool IsFueled (void) const { return m_IsFueled; } + +private: + + bool m_IsFueled; + } ; |