diff options
author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 17:11:34 +0100 |
---|---|---|
committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 17:11:34 +0100 |
commit | 15a980a6169ff975628bf1d4ecd16168fe609bf4 (patch) | |
tree | a7bc776991e20a21206f2198d1f702a6800bec6f /src/BlockEntities | |
parent | removed lua makefile (diff) | |
download | cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.gz cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.bz2 cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.lz cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.xz cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.tar.zst cuberite-15a980a6169ff975628bf1d4ecd16168fe609bf4.zip |
Diffstat (limited to '')
-rw-r--r-- | src/BlockEntities/BlockEntity.h | 6 | ||||
-rw-r--r-- | src/BlockEntities/BlockEntityWithItems.h | 1 | ||||
-rw-r--r-- | src/BlockEntities/FurnaceEntity.h | 2 | ||||
-rw-r--r-- | src/BlockEntities/JukeboxEntity.h | 2 | ||||
-rw-r--r-- | src/BlockEntities/NoteEntity.h | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h index 0d358b556..7c6688f8d 100644 --- a/src/BlockEntities/BlockEntity.h +++ b/src/BlockEntities/BlockEntity.h @@ -87,7 +87,11 @@ 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); + return false; + } protected: /// Position in absolute block coordinates diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index f35412e03..bf6289a2f 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -73,6 +73,7 @@ protected: // cItemGrid::cListener overrides: virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) { + UNUSED(a_SlotNum); ASSERT(a_Grid == &m_Contents); if (m_World != NULL) { diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h index 8b695d61a..b08187300 100644 --- a/src/BlockEntities/FurnaceEntity.h +++ b/src/BlockEntities/FurnaceEntity.h @@ -95,7 +95,7 @@ public: // tolua_end - void SetBurnTimes(int a_FuelBurnTime, int a_TimeBurned) {m_FuelBurnTime = a_FuelBurnTime; m_TimeBurned = 0; } + void SetBurnTimes(int a_FuelBurnTime, int a_TimeBurned) {m_FuelBurnTime = a_FuelBurnTime; m_TimeBurned = a_TimeBurned; } void SetCookTimes(int a_NeedCookTime, int a_TimeCooked) {m_NeedCookTime = a_NeedCookTime; m_TimeCooked = a_TimeCooked; } protected: diff --git a/src/BlockEntities/JukeboxEntity.h b/src/BlockEntities/JukeboxEntity.h index fcafdc479..996de965b 100644 --- a/src/BlockEntities/JukeboxEntity.h +++ b/src/BlockEntities/JukeboxEntity.h @@ -45,7 +45,7 @@ public: // tolua_end virtual void UsedBy(cPlayer * a_Player) override; - virtual void SendTo(cClientHandle & a_Client) override { }; + virtual void SendTo(cClientHandle &) override { }; private: int m_Record; diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h index e2d088f44..cf78aeac6 100644 --- a/src/BlockEntities/NoteEntity.h +++ b/src/BlockEntities/NoteEntity.h @@ -52,7 +52,7 @@ public: // tolua_end virtual void UsedBy(cPlayer * a_Player) override; - virtual void SendTo(cClientHandle & a_Client) override { }; + virtual void SendTo(cClientHandle &) override { }; private: char m_Pitch; |