1 files changed, 28 insertions, 27 deletions

diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp
index 612de658ce9..65f5d7d3d22 100644
--- a/source/gameengine/Expressions/VectorValue.cpp
+++ b/source/gameengine/Expressions/VectorValue.cpp
@@ -15,8 +15,8 @@
  *
  */
 
-#ifdef _MSC_VER
-#  pragma warning (disable:4786)
+#if defined(WIN32) && !defined(FREE_WINDOWS)
+#pragma warning (disable:4786)
 #endif
 
 #include "Value.h"
@@ -96,60 +96,61 @@ CValue* CVectorValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue
 {
 	CValue *ret = NULL;
 	
-	switch (op) {
-		case VALUE_ADD_OPERATOR:
+	switch(op)
+	{ 
+	case VALUE_ADD_OPERATOR: 
 		{
 			switch (dtype)
 			{
-				case VALUE_EMPTY_TYPE:
-				case VALUE_VECTOR_TYPE:
+			case VALUE_EMPTY_TYPE:
+			case VALUE_VECTOR_TYPE: 
 				{
 					ret = new CVectorValue(
-					            val->GetVector3()[KX_X] + GetVector3()[KX_X],
-					            val->GetVector3()[KX_Y] + GetVector3()[KX_Y],
-					            val->GetVector3()[KX_Z] + GetVector3()[KX_Z],
-					            CValue::HEAPVALUE);
+						val->GetVector3()[KX_X] + GetVector3()[KX_X],
+						val->GetVector3()[KX_Y] + GetVector3()[KX_Y],
+						val->GetVector3()[KX_Z] + GetVector3()[KX_Z],
+						CValue::HEAPVALUE);
 					ret->SetName(GetName());
 					break;
 				}
-
-				default:
-					ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
+			
+			default: 
+				ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
 			}
 			break;
 		}
-		case VALUE_MUL_OPERATOR:
+	case VALUE_MUL_OPERATOR:
 		{
 			switch (dtype)
 			{
 				
-				case VALUE_EMPTY_TYPE:
-				case VALUE_VECTOR_TYPE:
+			case VALUE_EMPTY_TYPE:
+			case VALUE_VECTOR_TYPE: 
 				{
 					//MT_Vector3 supports 'scaling' by another vector, instead of using general transform, Gino?
 					//ret = new CVectorValue(val->GetVector3().Scaled(GetVector3()),GetName());
 					break;
 				}
-				case VALUE_FLOAT_TYPE:
+			case VALUE_FLOAT_TYPE: 
 				{
 					ret = new CVectorValue(
-					            val->GetVector3()[KX_X] * GetVector3()[KX_X],
-					            val->GetVector3()[KX_Y] * GetVector3()[KX_Y],
-					            val->GetVector3()[KX_Z] * GetVector3()[KX_Z],
-					            CValue::HEAPVALUE);
+						val->GetVector3()[KX_X] * GetVector3()[KX_X],
+						val->GetVector3()[KX_Y] * GetVector3()[KX_Y],
+						val->GetVector3()[KX_Z] * GetVector3()[KX_Z],
+						CValue::HEAPVALUE);
 					ret->SetName(GetName());
 					break;
 				}
-
-				default:
-					ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
+			
+			default: 
+				ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
 			}
 			break;
 
 		}
-
-		default:
-			ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
+	
+	default:
+		ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
 	}