summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/FlowerPotEntity.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-09-05 16:56:31 +0200
committerTycho <work.tycho+git@gmail.com>2014-09-05 16:56:31 +0200
commit28f66efe307150558f4ad2546e058370a828be3e (patch)
tree2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/BlockEntities/FlowerPotEntity.h
parentMerge branch 'master' into ComponentRewrite (diff)
downloadcuberite-28f66efe307150558f4ad2546e058370a828be3e.tar
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz
cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst
cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/FlowerPotEntity.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h
index 478c54270..89901cf2d 100644
--- a/src/BlockEntities/FlowerPotEntity.h
+++ b/src/BlockEntities/FlowerPotEntity.h
@@ -40,9 +40,9 @@ public:
cFlowerPotEntity(int a_BlocX, int a_BlockY, int a_BlockZ, cWorld * a_World);
bool LoadFromJson( const Json::Value& a_Value);
- virtual void SaveToJson(Json::Value& a_Value) /*override*/;
+ virtual void SaveToJson(Json::Value& a_Value) override;
- virtual void Destroy(void) /*override*/;
+ virtual void Destroy(void) override;
// tolua_begin
@@ -57,8 +57,8 @@ public:
// tolua_end
- virtual void UsedBy(cPlayer * a_Player) /*override*/;
- virtual void SendTo(cClientHandle & a_Client) /*override*/;
+ virtual void UsedBy(cPlayer * a_Player) override;
+ virtual void SendTo(cClientHandle & a_Client) override;
static bool IsFlower(short m_ItemType, short m_ItemData);