summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 14:46:55 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 14:46:55 +0100
commitd7242414070aa823f879f225b0cf734f4a880759 (patch)
tree5a49a42221aca3ff37f901274ad60746f9747c40 /src/Simulator
parentMerge branch 'master' of github.com:mc-server/MCServer (diff)
downloadcuberite-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/Simulator/FireSimulator.h2
-rw-r--r--src/Simulator/RedstoneSimulator.h2
-rw-r--r--src/Simulator/SandSimulator.h2
-rw-r--r--src/Simulator/Simulator.h10
4 files changed, 11 insertions, 5 deletions
diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h
index f509c66e2..9ccc3ef4f 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 { UNUSED(a_Dt);} // 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 cfeb2b1f2..1080c3f81 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 { UNUSED(a_Dt);} // 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 { return IsRedstone(a_BlockType); }
diff --git a/src/Simulator/SandSimulator.h b/src/Simulator/SandSimulator.h
index 90447c915..6e64aa425 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(a_Dt);} // 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/Simulator.h b/src/Simulator/Simulator.h
index 3a6252024..a25b7f1b6 100644
--- a/src/Simulator/Simulator.h
+++ b/src/Simulator/Simulator.h
@@ -25,8 +25,14 @@ public:
virtual void Simulate(float a_Dt) = 0;
/// Called in each tick for each chunk, a_Dt is the time passed since the last tick, in msec; direct access to chunk data available
- virtual void SimulateChunk(float /*a_Dt*/, int /*a_ChunkX*/,
- int /*a_ChunkZ*/, cChunk * /*a_Chunk*/) {};
+ virtual void SimulateChunk(float a_Dt, int a_ChunkX,
+ int a_ChunkZ, cChunk * a_Chunk)
+ {
+ UNUSED(a_Dt);
+ UNUSED(a_ChunkX);
+ UNUSED(a_ChunkZ);
+ UNUSED(a_Chunk);
+ };
/// Called when a block changes
virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk);