1 files changed, 20 insertions, 2 deletions

diff --git a/src/Globals.h b/src/Globals.h
index 58badf4dd..d2080b8eb 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -14,7 +14,24 @@
 	#pragma warning(disable:4481)
 
 	// Disable some warnings that we don't care about:
-	#pragma warning(disable:4100)
+	#pragma warning(disable:4100) // Unreferenced formal parameter
+    
+    // Useful warnings from warning level 4:
+	#pragma warning(3 : 4127) // Conditional expression is constant
+	#pragma warning(3 : 4189) // Local variable is initialized but not referenced
+	#pragma warning(3 : 4245) // Conversion from 'type1' to 'type2', signed/unsigned mismatch
+	#pragma warning(3 : 4310) // Cast truncates constant value
+	#pragma warning(3 : 4389) // Signed/unsigned mismatch
+	#pragma warning(3 : 4505) // Unreferenced local function has been removed
+	#pragma warning(3 : 4701) // Potentially unitialized local variable used
+	#pragma warning(3 : 4702) // Unreachable code
+	#pragma warning(3 : 4706) // Assignment within conditional expression
+	
+	// Disabling this warning, because we know what we're doing when we're doing this:
+	#pragma warning(disable: 4355)  // 'this' used in initializer list
+	
+	// 2014_01_06 xoft: Disabled this warning because MSVC is stupid and reports it in obviously wrong places
+	// #pragma warning(3 : 4244) // Conversion from 'type1' to 'type2', possible loss of data
 
 	#define OBSOLETE __declspec(deprecated)
 
@@ -192,7 +209,7 @@ typedef unsigned short     UInt16;
 #ifdef  _DEBUG
 	#define ASSERT( x ) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), assert(0), 0 ) )
 #else
-	#define ASSERT(x) ((void)0)
+	#define ASSERT(x) ((void)(x))
 #endif
 
 // Pretty much the same as ASSERT() but stays in Release builds
@@ -216,6 +233,7 @@ public:
 
 // Common headers (part 2, with macros):
 #include "ChunkDef.h"
+#include "BiomeDef.h"
 #include "BlockID.h"
 #include "Entities/Effects.h"