From 2e1588820d3c27a82d4bd6401dc9af728130908c Mon Sep 17 00:00:00 2001
From: Tycho Bickerstaff <work.tycho@gmail.com>
Date: Sun, 22 Dec 2013 14:55:24 +0000
Subject: [PATCH] fixed warnings in World.cpp

---
 src/BlockTracer.h                  | 25 ++++++++++++++++++++++---
 src/Simulator/NoopFluidSimulator.h | 10 ++++++++--
 src/World.cpp                      |  4 +++-
 src/World.h                        |  1 +
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/BlockTracer.h b/src/BlockTracer.h
index d0a34811d..40d80da1a 100644
--- a/src/BlockTracer.h
+++ b/src/BlockTracer.h
@@ -36,7 +36,14 @@ public:
 		/** Called on each block encountered along the path, including the first block (path start), if chunk data is not loaded
 		When this callback returns true, the tracing is aborted.
 		*/
-		virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ, char a_EntryFace) { return false; }
+		virtual bool OnNextBlockNoData(int a_BlockX, int a_BlockY, int a_BlockZ, char a_EntryFace) 
+		{ 
+			UNUSED(a_BlockX);
+			UNUSED(a_BlockY);
+			UNUSED(a_BlockZ);
+			UNUSED(a_EntryFace);
+			return false; 
+		}
 		
 		/** Called when the path goes out of world, either below (a_BlockY < 0) or above (a_BlockY >= cChunkDef::Height)
 		The coords specify the exact point at which the path exited the world.
@@ -44,7 +51,13 @@ public:
 		Note that some paths can go out of the world and come back again (parabola),
 		in such a case this callback is followed by OnIntoWorld() and further OnNextBlock() calls
 		*/
-		virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) { return false; }
+		virtual bool OnOutOfWorld(double a_BlockX, double a_BlockY, double a_BlockZ) 
+		{ 
+			UNUSED(a_BlockX);
+			UNUSED(a_BlockY);
+			UNUSED(a_BlockZ);
+			return false;
+		}
 		
 		/** Called when the path goes into the world, from either below (a_BlockY < 0) or above (a_BlockY >= cChunkDef::Height)
 		The coords specify the exact point at which the path entered the world.
@@ -52,7 +65,13 @@ public:
 		Note that some paths can go out of the world and come back again (parabola),
 		in such a case this callback is followed by further OnNextBlock() calls
 		*/
-		virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) { return false; }
+		virtual bool OnIntoWorld(double a_BlockX, double a_BlockY, double a_BlockZ) 
+		{ 
+			UNUSED(a_BlockX);
+			UNUSED(a_BlockY);
+			UNUSED(a_BlockZ);
+			return false; 
+		}
 		
 		/** Called when the path is sure not to hit any more blocks.
 		Note that for some shapes this might never happen (line with constant Y)
diff --git a/src/Simulator/NoopFluidSimulator.h b/src/Simulator/NoopFluidSimulator.h
index 8f894433f..9113aec3c 100644
--- a/src/Simulator/NoopFluidSimulator.h
+++ b/src/Simulator/NoopFluidSimulator.h
@@ -27,8 +27,14 @@ public:
 	}
 
 	// cSimulator overrides:
-	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override {}
-	virtual void Simulate(float a_Dt) override {}
+	virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override 
+	{
+		UNUSED(a_BlockX);
+		UNUSED(a_BlockY);
+		UNUSED(a_BlockZ);
+		UNUSED(a_Chunk);
+	}
+	virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);}
 } ;
 
 
diff --git a/src/World.cpp b/src/World.cpp
index 28c46c27e..cc543d460 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -723,6 +723,7 @@ void cWorld::Tick(float a_Dt, int a_LastTickDurationMSec)
 
 void cWorld::TickWeather(float a_Dt)
 {
+	UNUSED(a_Dt);
 	// There are no weather changes anywhere but in the Overworld:
 	if (GetDimension() != dimOverworld)
 	{
@@ -794,7 +795,7 @@ void cWorld::TickMobs(float a_Dt)
 			cMonster::mfAmbient,
 			cMonster::mfWater,
 		} ;
-		for (int i = 0; i < ARRAYCOUNT(AllFamilies); i++)
+		for (size_t i = 0; i < ARRAYCOUNT(AllFamilies); i++)
 		{
 			cMonster::eFamily Family = AllFamilies[i];
 			int SpawnDelay = cMonster::GetSpawnDelay(Family);
@@ -1643,6 +1644,7 @@ int cWorld::SpawnExperienceOrb(double a_X, double a_Y, double a_Z, int a_Reward)
 
 void cWorld::SpawnPrimedTNT(double a_X, double a_Y, double a_Z, double a_FuseTimeInSec, double a_InitialVelocityCoeff)
 {
+	UNUSED(a_InitialVelocityCoeff);
 	cTNTEntity * TNT = new cTNTEntity(a_X, a_Y, a_Z, a_FuseTimeInSec);
 	TNT->Initialize(this);
 	// TODO: Add a bit of speed in horiz and vert axes, based on the a_InitialVelocityCoeff
diff --git a/src/World.h b/src/World.h
index c067252d9..67f1275c0 100644
--- a/src/World.h
+++ b/src/World.h
@@ -78,6 +78,7 @@ public:
 	class cTask
 	{
 	public:
+		virtual ~cTask(){};
 		virtual void Run(cWorld & a_World) = 0;
 	} ;