diff options
| author | worktycho <work.tycho@gmail.com> | 2015-05-23 16:31:49 +0200 |
|---|---|---|
| committer | worktycho <work.tycho@gmail.com> | 2015-05-23 16:31:49 +0200 |
| commit | 7e0dc0f9bc4c555c67a3dfe48669916259c16b5a (patch) | |
| tree | aaa204d290f99d1b6f251055f046e8e86c795bfd /src/BlockEntities | |
| parent | Merge pull request #2116 from mc-server/CMakeCacheOptions (diff) | |
| parent | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. (diff) | |
| download | cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.gz cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.bz2 cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.lz cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.xz cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.tar.zst cuberite-7e0dc0f9bc4c555c67a3dfe48669916259c16b5a.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) { |