summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 16:58:21 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 16:58:21 +0100
commitb3046a09e5dfaa8e675c6309dc77ea517616f101 (patch)
tree3ca1208f9b41382a08f0c3b13114516c2bb3a999
parentfixed hidden bug with furnaces ignoring time burnt (diff)
downloadcuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.tar
cuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.tar.gz
cuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.tar.bz2
cuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.tar.lz
cuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.tar.xz
cuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.tar.zst
cuberite-b3046a09e5dfaa8e675c6309dc77ea517616f101.zip
-rw-r--r--src/BlockEntities/BlockEntityWithItems.h2
-rw-r--r--src/BlockEntities/JukeboxEntity.h2
-rw-r--r--src/BlockEntities/NoteEntity.h2
-rw-r--r--src/Chunk.cpp5
4 files changed, 5 insertions, 6 deletions
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index f35412e03..f2c51fd9e 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -71,7 +71,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*/)
{
ASSERT(a_Grid == &m_Contents);
if (m_World != NULL)
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;
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 3c44b91d0..adeec37f5 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -527,9 +527,9 @@ void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner)
// MG TODO : check that "Level" really means Y
- NIBBLETYPE SkyLight = 0;
+ /*NIBBLETYPE SkyLight = 0;
- NIBBLETYPE BlockLight = 0;
+ NIBBLETYPE BlockLight = 0;*/
if (IsLightValid())
{
@@ -2323,7 +2323,6 @@ BLOCKTYPE cChunk::GetBlock(int a_BlockIdx) const
void cChunk::GetBlockTypeMeta(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta)
{
- int Idx = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY, a_RelZ);
a_BlockType = cChunkDef::GetBlock (m_BlockTypes, a_RelX, a_RelY, a_RelZ);
a_BlockMeta = cChunkDef::GetNibble(m_BlockMeta, a_RelX, a_RelY, a_RelZ);
}