summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 16:08:01 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 16:08:01 +0100
commit5034ae29b889b37c10524678e4b92d8ca700bde7 (patch)
tree20b64b211c4c100f770bafad70b1ddc6cbeb2464
parentChunkSender is now warnings clean (diff)
downloadcuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.tar
cuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.tar.gz
cuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.tar.bz2
cuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.tar.lz
cuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.tar.xz
cuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.tar.zst
cuberite-5034ae29b889b37c10524678e4b92d8ca700bde7.zip
-rw-r--r--src/Blocks/BlockHandler.h2
-rw-r--r--src/Piston.cpp2
-rw-r--r--src/Simulator/FireSimulator.h2
-rw-r--r--src/Simulator/RedstoneSimulator.h4
-rw-r--r--src/Simulator/SandSimulator.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h
index 107d36476..1dc0e2a2a 100644
--- a/src/Blocks/BlockHandler.h
+++ b/src/Blocks/BlockHandler.h
@@ -99,7 +99,7 @@ public:
virtual bool DoesIgnoreBuildCollision(void);
/// <summary>Similar to DoesIgnoreBuildCollision(void), but is used for cases where block meta/player item-in-hand is needed to determine collision (thin snow)</summary>
- virtual bool DoesIgnoreBuildCollision(cPlayer * a_Player, NIBBLETYPE a_Meta) { return DoesIgnoreBuildCollision(); }
+ virtual bool DoesIgnoreBuildCollision(cPlayer *, NIBBLETYPE /*a_Meta*/) { return DoesIgnoreBuildCollision(); }
/// <summary>Returns if this block drops if it gets destroyed by an unsuitable situation. Default: true</summary>
virtual bool DoesDropOnUnsuitable(void);
diff --git a/src/Piston.cpp b/src/Piston.cpp
index b15e7d95e..17729a352 100644
--- a/src/Piston.cpp
+++ b/src/Piston.cpp
@@ -236,7 +236,7 @@ bool cPiston::CanPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
-bool cPiston::CanBreakPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
+bool cPiston::CanBreakPush(BLOCKTYPE a_BlockType, NIBBLETYPE /*a_BlockMeta*/)
{
return g_BlockPistonBreakable[a_BlockType];
}
diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h
index 66c31b440..f509c66e2 100644
--- a/src/Simulator/FireSimulator.h
+++ b/src/Simulator/FireSimulator.h
@@ -22,7 +22,7 @@ public:
cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);
~cFireSimulator();
- virtual void Simulate(float a_Dt) override {} // not used
+ virtual void Simulate(float /*a_Dt*/) override {} // not used
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;
diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h
index 309135497..903ac8775 100644
--- a/src/Simulator/RedstoneSimulator.h
+++ b/src/Simulator/RedstoneSimulator.h
@@ -19,7 +19,7 @@ public:
cRedstoneSimulator(cWorld & a_World);
~cRedstoneSimulator();
- virtual void Simulate(float a_Dt) override {}; // Not used in this simulator
+ virtual void Simulate(float /*a_Dt*/) override {}; // Not used in this simulator
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return IsRedstone(a_BlockType); }
@@ -269,4 +269,4 @@ private:
default: return false;
}
}
-}; \ No newline at end of file
+};
diff --git a/src/Simulator/SandSimulator.h b/src/Simulator/SandSimulator.h
index 6e9ea15ac..90447c915 100644
--- a/src/Simulator/SandSimulator.h
+++ b/src/Simulator/SandSimulator.h
@@ -15,7 +15,7 @@ public:
cSandSimulator(cWorld & a_World, cIniFile & a_IniFile);
// cSimulator overrides:
- virtual void Simulate(float a_Dt) override {} // Unused in this simulator
+ virtual void Simulate(float /*a_Dt*/) override {} // Unused in this simulator
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;