diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 14:46:55 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 14:46:55 +0100 |
| commit | d7242414070aa823f879f225b0cf734f4a880759 (patch) | |
| tree | 5a49a42221aca3ff37f901274ad60746f9747c40 /src/BlockEntities | |
| parent | Merge branch 'master' of github.com:mc-server/MCServer (diff) | |
| download | cuberite-d7242414070aa823f879f225b0cf734f4a880759.tar cuberite-d7242414070aa823f879f225b0cf734f4a880759.tar.gz cuberite-d7242414070aa823f879f225b0cf734f4a880759.tar.bz2 cuberite-d7242414070aa823f879f225b0cf734f4a880759.tar.lz cuberite-d7242414070aa823f879f225b0cf734f4a880759.tar.xz cuberite-d7242414070aa823f879f225b0cf734f4a880759.tar.zst cuberite-d7242414070aa823f879f225b0cf734f4a880759.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/BlockEntities/BlockEntity.h | 7 | ||||
| -rw-r--r-- | src/BlockEntities/BlockEntityWithItems.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h index 4a2939b32..c3b8d41c0 100644 --- a/src/BlockEntities/BlockEntity.h +++ b/src/BlockEntities/BlockEntity.h @@ -87,7 +87,12 @@ public: virtual void SendTo(cClientHandle & a_Client) = 0; /// Ticks the entity; returns true if the chunk should be marked as dirty as a result of this ticking. By default does nothing. - virtual bool Tick(float /*a_Dt*/, cChunk & /*a_Chunk*/) { return false; } + virtual bool Tick(float a_Dt, cChunk & a_Chunk) + { + UNUSED(a_Dt); + UNUSED(a_Chunk); + return false; + } protected: /// Position in absolute block coordinates diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index f2c51fd9e..bf6289a2f 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -71,8 +71,9 @@ 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) { + UNUSED(a_SlotNum); ASSERT(a_Grid == &m_Contents); if (m_World != NULL) { |