From 15a980a6169ff975628bf1d4ecd16168fe609bf4 Mon Sep 17 00:00:00 2001
From: Tycho Bickerstaff <work.tycho@gmail.com>
Date: Sun, 22 Dec 2013 16:11:34 +0000
Subject: merged in warnings changes

---
 src/Blocks/BlockHandler.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/Blocks/BlockHandler.h')

diff --git a/src/Blocks/BlockHandler.h b/src/Blocks/BlockHandler.h
index 107d36476..a732aa797 100644
--- a/src/Blocks/BlockHandler.h
+++ b/src/Blocks/BlockHandler.h
@@ -99,7 +99,11 @@ 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) 
+	{ 
+		UNUSED(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);
-- 
cgit v1.2.3