summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorHaoTNN <haotnn@gmail.com>2015-05-23 23:06:37 +0200
committerHaoTNN <haotnn@gmail.com>2015-05-23 23:06:37 +0200
commit2578afb2449ac27defb3ac9dcc3d140e980d0d1a (patch)
tree4f8e0f52f39c1eb3189680b0395134d4b72a2228 /src/BlockEntities
parentMerge remote-tracking branch 'upstream/master' (diff)
parentMerge pull request #2107 from mc-server/cow-waterspawn (diff)
downloadcuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar
cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.gz
cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.bz2
cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.lz
cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.xz
cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.tar.zst
cuberite-2578afb2449ac27defb3ac9dcc3d140e980d0d1a.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/BlockEntityWithItems.h2
-rw-r--r--src/BlockEntities/NoteEntity.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index 740dbca51..30a09bc02 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -76,7 +76,7 @@ protected:
cItemGrid m_Contents;
// cItemGrid::cListener overrides:
- virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
+ virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) override
{
UNUSED(a_SlotNum);
ASSERT(a_Grid == &m_Contents);
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index d3f85e9d2..f350ef4c4 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -52,7 +52,7 @@ public:
virtual void UsedBy(cPlayer * a_Player) override;
virtual void SendTo(cClientHandle &) override {}
- virtual void SetRedstonePower(bool a_Value)
+ virtual void SetRedstonePower(bool a_Value) override
{
if (a_Value)
{