diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-03-14 00:05:06 +0100 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-03-14 00:05:06 +0100 |
commit | 3d398baf355fd0dee0e282a73c61fe79f288db8f (patch) | |
tree | cc4fc49b1dbcbdf3b0bee969d4b3b5e3ac22ba99 /src/Entities/Painting.h | |
parent | Fixed confusion over Item Frame directions (diff) | |
download | cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.tar cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.tar.gz cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.tar.bz2 cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.tar.lz cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.tar.xz cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.tar.zst cuberite-3d398baf355fd0dee0e282a73c61fe79f288db8f.zip |
Diffstat (limited to '')
-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 |