diff options
author | Mattes D <github@xoft.cz> | 2015-03-15 14:30:23 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2015-03-15 14:30:23 +0100 |
commit | 0add3d461782b7a89ff614f78f77cbb37476594d (patch) | |
tree | 22f4c7f9023efc0554cc0c2b67235b93b8bd82fb /src/Entities/Painting.h | |
parent | Merge pull request #1811 from mc-server/grass (diff) | |
parent | Fixed style violations (diff) | |
download | cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.tar cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.tar.gz cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.tar.bz2 cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.tar.lz cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.tar.xz cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.tar.zst cuberite-0add3d461782b7a89ff614f78f77cbb37476594d.zip |
Diffstat (limited to 'src/Entities/Painting.h')
-rw-r--r-- | src/Entities/Painting.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/Entities/Painting.h b/src/Entities/Painting.h index 6e8a382fc..20968d4f0 100644 --- a/src/Entities/Painting.h +++ b/src/Entities/Painting.h @@ -1,7 +1,7 @@ #pragma once -#include "Entity.h" +#include "HangingEntity.h" @@ -9,9 +9,9 @@ // tolua_begin class cPainting : - public cEntity + public cHangingEntity { - typedef cEntity super; + typedef cHangingEntity super; public: @@ -19,19 +19,14 @@ public: CLASS_PROTODEF(cPainting) - cPainting(const AString & a_Name, int a_Direction, double a_X, double a_Y, double a_Z); + cPainting(const AString & a_Name, eBlockFace a_Direction, double a_X, double a_Y, double a_Z); - // tolua_begin - - const AString & GetName(void) const { return m_Name; } - int GetDirection(void) const { return m_Direction; } - - // tolua_end + /** Returns the protocol name of the painting */ + const AString & GetName(void) const { return m_Name; } // tolua_export private: virtual void SpawnOn(cClientHandle & a_Client) override; - virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; virtual void GetDrops(cItems & a_Items, cEntity * a_Killer) override; virtual void KilledBy(TakeDamageInfo & a_TDI) override { @@ -40,7 +35,6 @@ private: } AString m_Name; - int m_Direction; }; // tolua_export |