diff options
author | tycho <work.tycho@gmail.com> | 2015-05-23 16:33:52 +0200 |
---|---|---|
committer | tycho <work.tycho@gmail.com> | 2015-05-23 16:33:52 +0200 |
commit | 81c0116cf1c0b06e24f9f69e219c3f1e302d81e2 (patch) | |
tree | 8df120fde19c9c27f5a8681a7952aa9e802bc800 /src/BlockEntities | |
parent | Merge branch 'master' into PreventNewWarnings (diff) | |
parent | Merge pull request #2117 from Seadragon91/clang_errors (diff) | |
download | cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.gz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.bz2 cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.lz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.xz cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.tar.zst cuberite-81c0116cf1c0b06e24f9f69e219c3f1e302d81e2.zip |
Diffstat (limited to 'src/BlockEntities')
-rw-r--r-- | src/BlockEntities/BlockEntityWithItems.h | 2 | ||||
-rw-r--r-- | src/BlockEntities/NoteEntity.h | 2 |
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) { |