1 files changed, 7 insertions, 4 deletions

diff --git a/src/Globals.h b/src/Globals.h
index 1765c53d8..f886ba2d0 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -17,16 +17,19 @@
 	#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 : 4702) // Unreachable code
 	#pragma warning(3 : 4245) // Conversion from 'type1' to 'type2', signed/unsigned mismatch
-	#pragma warning(3 : 4389) // Signed/unsigned mismatch
-	#pragma warning(3 : 4701) // Potentially unitialized local variable used
 	#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 : 4127) // Conditional expression is constant
+	#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