summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-24 20:29:59 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-24 20:29:59 +0100
commitdf193c8f6f414525850092b2705343605cb74137 (patch)
tree7d32968ed3c95ec722182cfa4223d2f3dd79fb01 /src/BlockEntities
parentMerge pull request #710 from TheJumper/master (diff)
downloadcuberite-df193c8f6f414525850092b2705343605cb74137.tar
cuberite-df193c8f6f414525850092b2705343605cb74137.tar.gz
cuberite-df193c8f6f414525850092b2705343605cb74137.tar.bz2
cuberite-df193c8f6f414525850092b2705343605cb74137.tar.lz
cuberite-df193c8f6f414525850092b2705343605cb74137.tar.xz
cuberite-df193c8f6f414525850092b2705343605cb74137.tar.zst
cuberite-df193c8f6f414525850092b2705343605cb74137.zip
Diffstat (limited to 'src/BlockEntities')
-rw-r--r--src/BlockEntities/CommandBlockEntity.cpp2
-rw-r--r--src/BlockEntities/DropSpenserEntity.cpp1
-rw-r--r--src/BlockEntities/FurnaceEntity.cpp6
-rw-r--r--src/BlockEntities/FurnaceEntity.h2
-rw-r--r--src/BlockEntities/HopperEntity.cpp2
-rw-r--r--src/BlockEntities/NoteEntity.cpp1
6 files changed, 11 insertions, 3 deletions
diff --git a/src/BlockEntities/CommandBlockEntity.cpp b/src/BlockEntities/CommandBlockEntity.cpp
index 0bc6ca359..687f75c95 100644
--- a/src/BlockEntities/CommandBlockEntity.cpp
+++ b/src/BlockEntities/CommandBlockEntity.cpp
@@ -126,6 +126,8 @@ void cCommandBlockEntity::SetRedstonePower(bool a_IsPowered)
bool cCommandBlockEntity::Tick(float a_Dt, cChunk & a_Chunk)
{
+ UNUSED(a_Dt);
+ UNUSED(a_Chunk);
if (!m_ShouldExecute)
{
return false;
diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp
index 81df0fc8c..0012742fb 100644
--- a/src/BlockEntities/DropSpenserEntity.cpp
+++ b/src/BlockEntities/DropSpenserEntity.cpp
@@ -129,6 +129,7 @@ void cDropSpenserEntity::SetRedstonePower(bool a_IsPowered)
bool cDropSpenserEntity::Tick(float a_Dt, cChunk & a_Chunk)
{
+ UNUSED(a_Dt);
if (!m_ShouldDropSpense)
{
return false;
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index c6643bcff..7d6d1f89e 100644
--- a/src/BlockEntities/FurnaceEntity.cpp
+++ b/src/BlockEntities/FurnaceEntity.cpp
@@ -94,6 +94,8 @@ bool cFurnaceEntity::ContinueCooking(void)
bool cFurnaceEntity::Tick(float a_Dt, cChunk & a_Chunk)
{
+ UNUSED(a_Dt);
+ UNUSED(a_Chunk);
if (m_FuelBurnTime <= 0)
{
// No fuel is burning, reset progressbars and bail out
@@ -110,7 +112,7 @@ bool cFurnaceEntity::Tick(float a_Dt, cChunk & a_Chunk)
if (m_TimeCooked >= m_NeedCookTime)
{
// Finished smelting one item
- FinishOne(a_Chunk);
+ FinishOne();
}
}
@@ -208,7 +210,7 @@ void cFurnaceEntity::BroadcastProgress(int a_ProgressbarID, short a_Value)
/// One item finished cooking
-void cFurnaceEntity::FinishOne(cChunk & a_Chunk)
+void cFurnaceEntity::FinishOne()
{
m_TimeCooked = 0;
diff --git a/src/BlockEntities/FurnaceEntity.h b/src/BlockEntities/FurnaceEntity.h
index 5e08ae37a..4f935a74b 100644
--- a/src/BlockEntities/FurnaceEntity.h
+++ b/src/BlockEntities/FurnaceEntity.h
@@ -126,7 +126,7 @@ protected:
void BroadcastProgress(int a_ProgressbarID, short a_Value);
/// One item finished cooking
- void FinishOne(cChunk & a_Chunk);
+ void FinishOne();
/// Starts burning a new fuel, if possible
void BurnNewFuel(void);
diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp
index 31b23ac99..729d3a2cc 100644
--- a/src/BlockEntities/HopperEntity.cpp
+++ b/src/BlockEntities/HopperEntity.cpp
@@ -58,6 +58,7 @@ bool cHopperEntity::GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, i
bool cHopperEntity::Tick(float a_Dt, cChunk & a_Chunk)
{
+ UNUSED(a_Dt);
Int64 CurrentTick = a_Chunk.GetWorld()->GetWorldAge();
bool res = false;
@@ -73,6 +74,7 @@ bool cHopperEntity::Tick(float a_Dt, cChunk & a_Chunk)
void cHopperEntity::SaveToJson(Json::Value & a_Value)
{
+ UNUSED(a_Value);
// TODO
LOGWARNING("%s: Not implemented yet", __FUNCTION__);
}
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 9a33ead62..58b05a324 100644
--- a/src/BlockEntities/NoteEntity.cpp
+++ b/src/BlockEntities/NoteEntity.cpp
@@ -21,6 +21,7 @@ cNoteEntity::cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_Wo
void cNoteEntity::UsedBy(cPlayer * a_Player)
{
+ UNUSED(a_Player);
IncrementPitch();
MakeSound();
}