7 files changed, 406 insertions, 419 deletions

diff --git a/source/gameengine/Expressions/BoolValue.cpp b/source/gameengine/Expressions/BoolValue.cpp
index e640923129a..ee913877c96 100644
--- a/source/gameengine/Expressions/BoolValue.cpp
+++ b/source/gameengine/Expressions/BoolValue.cpp
@@ -104,39 +104,37 @@ this object
 {
 	CValue *ret;
 	
-	switch(dtype)
-	{
-	case VALUE_EMPTY_TYPE:
-	case VALUE_BOOL_TYPE:
+	switch (dtype) {
+		case VALUE_EMPTY_TYPE:
+		case VALUE_BOOL_TYPE:
 		{
-			switch(op)
-			{
-			case VALUE_AND_OPERATOR:
+			switch (op) {
+				case VALUE_AND_OPERATOR:
 				{
 					ret = new CBoolValue (((CBoolValue *) val)->GetBool() && m_bool);
 					break;
 				}
-			case VALUE_OR_OPERATOR:
+				case VALUE_OR_OPERATOR:
 				{
 					ret = new CBoolValue (((CBoolValue *) val)->GetBool() || m_bool);
 					break;
 				}
-			case VALUE_EQL_OPERATOR:
+				case VALUE_EQL_OPERATOR:
 				{
 					ret = new CBoolValue (((CBoolValue *) val)->GetBool() == m_bool);
 					break;
 				}
-			case VALUE_NEQ_OPERATOR:
+				case VALUE_NEQ_OPERATOR:
 				{
 					ret = new CBoolValue (((CBoolValue *) val)->GetBool() != m_bool);
 					break;
 				}
-			case VALUE_NOT_OPERATOR:
+				case VALUE_NOT_OPERATOR:
 				{
 					return new CBoolValue (!m_bool);
 					break;
 				}
-			default:
+				default:
 				{
 					ret =  new CErrorValue(val->GetText() + op2str(op) +
 					                       "[operator not allowed on booleans]");
@@ -145,16 +143,15 @@ this object
 			}
 			break;
 		}
-	case VALUE_STRING_TYPE:
+		case VALUE_STRING_TYPE:
 		{
-			switch(op)
-			{
-			case VALUE_ADD_OPERATOR:
+			switch (op) {
+				case VALUE_ADD_OPERATOR:
 				{
 					ret = new CStringValue(val->GetText() + GetText(),"");
 					break;
 				}
-			default:
+				default:
 				{
 					ret =  new CErrorValue(val->GetText() + op2str(op) + "[Only + allowed on boolean and string]");
 					break;
@@ -162,8 +159,8 @@ this object
 			}
 			break;
 		}
-	default:
-		ret =  new CErrorValue("[type mismatch]" + op2str(op) + GetText());
+		default:
+			ret =  new CErrorValue("[type mismatch]" + op2str(op) + GetText());
 	}
 
 	return ret;
diff --git a/source/gameengine/Expressions/FloatValue.cpp b/source/gameengine/Expressions/FloatValue.cpp
index c9b59e52ee8..b7d7f528155 100644
--- a/source/gameengine/Expressions/FloatValue.cpp
+++ b/source/gameengine/Expressions/FloatValue.cpp
@@ -120,138 +120,134 @@ ret: a new object containing the result of applying operator op to val and
 {
 	CValue *ret;
 	
-	switch(dtype)
-	{
-	case VALUE_INT_TYPE:
+	switch (dtype) {
+		case VALUE_INT_TYPE:
 		{
-			switch (op)
-			{
-			case VALUE_MOD_OPERATOR:
-				ret = new CFloatValue(fmod(((CIntValue *) val)->GetInt(), m_float));
-				break;
-			case VALUE_ADD_OPERATOR:
-				ret = new CFloatValue(((CIntValue *) val)->GetInt() + m_float);
-				break;
-			case VALUE_SUB_OPERATOR:
-				ret = new CFloatValue(((CIntValue *) val)->GetInt() - m_float);
-				break;
-			case VALUE_MUL_OPERATOR:
-				ret = new CFloatValue(((CIntValue *) val)->GetInt() * m_float);
-				break;
-			case VALUE_DIV_OPERATOR:
-				if (m_float == 0)
-					ret = new CErrorValue("Division by zero");
-				else
-					ret = new CFloatValue (((CIntValue *) val)->GetInt() / m_float);
-				break;
-			case VALUE_EQL_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() == m_float);
-				break;
-			case VALUE_NEQ_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() != m_float);
-				break;
-			case VALUE_GRE_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() > m_float);
-				break;
-			case VALUE_LES_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() < m_float);
-				break;
-			case VALUE_GEQ_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() >= m_float);
-				break;
-			case VALUE_LEQ_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() <= m_float);
-				break;
-			default:
-				ret = new CErrorValue("illegal operator. please send a bug report.");
-				break;
+			switch (op) {
+				case VALUE_MOD_OPERATOR:
+					ret = new CFloatValue(fmod(((CIntValue *) val)->GetInt(), m_float));
+					break;
+				case VALUE_ADD_OPERATOR:
+					ret = new CFloatValue(((CIntValue *) val)->GetInt() + m_float);
+					break;
+				case VALUE_SUB_OPERATOR:
+					ret = new CFloatValue(((CIntValue *) val)->GetInt() - m_float);
+					break;
+				case VALUE_MUL_OPERATOR:
+					ret = new CFloatValue(((CIntValue *) val)->GetInt() * m_float);
+					break;
+				case VALUE_DIV_OPERATOR:
+					if (m_float == 0)
+						ret = new CErrorValue("Division by zero");
+					else
+						ret = new CFloatValue (((CIntValue *) val)->GetInt() / m_float);
+					break;
+				case VALUE_EQL_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() == m_float);
+					break;
+				case VALUE_NEQ_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() != m_float);
+					break;
+				case VALUE_GRE_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() > m_float);
+					break;
+				case VALUE_LES_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() < m_float);
+					break;
+				case VALUE_GEQ_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() >= m_float);
+					break;
+				case VALUE_LEQ_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() <= m_float);
+					break;
+				default:
+					ret = new CErrorValue("illegal operator. please send a bug report.");
+					break;
 			}
 			break;
 		}
-	case VALUE_EMPTY_TYPE:
-	case VALUE_FLOAT_TYPE:
+		case VALUE_EMPTY_TYPE:
+		case VALUE_FLOAT_TYPE:
 		{
-			switch (op)
-			{
-			case VALUE_MOD_OPERATOR:
-				ret = new CFloatValue(fmod(((CFloatValue *) val)->GetFloat(), m_float));
-				break;
-			case VALUE_ADD_OPERATOR:
-				ret = new CFloatValue(((CFloatValue *) val)->GetFloat() + m_float);
-				break;
-			case VALUE_SUB_OPERATOR:
-				ret = new CFloatValue(((CFloatValue *) val)->GetFloat() - m_float);
-				break;
-			case VALUE_MUL_OPERATOR:
-				ret = new CFloatValue(((CFloatValue *) val)->GetFloat() * m_float);
-				break;
-			case VALUE_DIV_OPERATOR:
-				if (m_float == 0)
-					ret = new CErrorValue("Division by zero");
-				else
-					ret = new CFloatValue (((CFloatValue *) val)->GetFloat() / m_float);
-				break;
-			case VALUE_EQL_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() == m_float);
-				break;
-			case VALUE_NEQ_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() != m_float);
-				break;
-			case VALUE_GRE_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() > m_float);
-				break;
-			case VALUE_LES_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() < m_float);
-				break;
-			case VALUE_GEQ_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() >= m_float);
-				break;
-			case VALUE_LEQ_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() <= m_float);
-				break;
-			case VALUE_NEG_OPERATOR:
-				ret = new CFloatValue (-m_float);
-				break;
-			case VALUE_POS_OPERATOR:
-				ret = new CFloatValue (m_float);
-				break;
-				
-			default:
-				ret = new CErrorValue("illegal operator. please send a bug report.");
-				break;
+			switch (op) {
+				case VALUE_MOD_OPERATOR:
+					ret = new CFloatValue(fmod(((CFloatValue *) val)->GetFloat(), m_float));
+					break;
+				case VALUE_ADD_OPERATOR:
+					ret = new CFloatValue(((CFloatValue *) val)->GetFloat() + m_float);
+					break;
+				case VALUE_SUB_OPERATOR:
+					ret = new CFloatValue(((CFloatValue *) val)->GetFloat() - m_float);
+					break;
+				case VALUE_MUL_OPERATOR:
+					ret = new CFloatValue(((CFloatValue *) val)->GetFloat() * m_float);
+					break;
+				case VALUE_DIV_OPERATOR:
+					if (m_float == 0)
+						ret = new CErrorValue("Division by zero");
+					else
+						ret = new CFloatValue (((CFloatValue *) val)->GetFloat() / m_float);
+					break;
+				case VALUE_EQL_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() == m_float);
+					break;
+				case VALUE_NEQ_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() != m_float);
+					break;
+				case VALUE_GRE_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() > m_float);
+					break;
+				case VALUE_LES_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() < m_float);
+					break;
+				case VALUE_GEQ_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() >= m_float);
+					break;
+				case VALUE_LEQ_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() <= m_float);
+					break;
+				case VALUE_NEG_OPERATOR:
+					ret = new CFloatValue (-m_float);
+					break;
+				case VALUE_POS_OPERATOR:
+					ret = new CFloatValue (m_float);
+					break;
+
+				default:
+					ret = new CErrorValue("illegal operator. please send a bug report.");
+					break;
 			}
 			break;
 		}
-	case VALUE_STRING_TYPE:
+		case VALUE_STRING_TYPE:
 		{
-			switch(op)
-			{
-			case VALUE_ADD_OPERATOR:
-				ret = new CStringValue(val->GetText() + GetText(),"");
-				break;
-			case VALUE_EQL_OPERATOR:
-			case VALUE_NEQ_OPERATOR:
-			case VALUE_GRE_OPERATOR:
-			case VALUE_LES_OPERATOR:
-			case VALUE_GEQ_OPERATOR:
-			case VALUE_LEQ_OPERATOR:
-				ret = new CErrorValue("[Cannot compare string with float]" + op2str(op) + GetText());
-				break;
-			default:
-				ret =  new CErrorValue("[operator not allowed on strings]" + op2str(op) + GetText());
-				break;
+			switch (op) {
+				case VALUE_ADD_OPERATOR:
+					ret = new CStringValue(val->GetText() + GetText(),"");
+					break;
+				case VALUE_EQL_OPERATOR:
+				case VALUE_NEQ_OPERATOR:
+				case VALUE_GRE_OPERATOR:
+				case VALUE_LES_OPERATOR:
+				case VALUE_GEQ_OPERATOR:
+				case VALUE_LEQ_OPERATOR:
+					ret = new CErrorValue("[Cannot compare string with float]" + op2str(op) + GetText());
+					break;
+				default:
+					ret =  new CErrorValue("[operator not allowed on strings]" + op2str(op) + GetText());
+					break;
 			}
 			break;
 		}
-	case VALUE_BOOL_TYPE:
-		ret =  new CErrorValue("[operator not valid on boolean and float]" + op2str(op) + GetText());
-		break;
-	case VALUE_ERROR_TYPE:
-		ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
-		break;
-	default:
-		ret = new CErrorValue("illegal type. contact your dealer (if any)");
-		break;
+		case VALUE_BOOL_TYPE:
+			ret =  new CErrorValue("[operator not valid on boolean and float]" + op2str(op) + GetText());
+			break;
+		case VALUE_ERROR_TYPE:
+			ret = new CErrorValue(val->GetText() + op2str(op) + GetText());
+			break;
+		default:
+			ret = new CErrorValue("illegal type. contact your dealer (if any)");
+			break;
 	}
 	return ret;
 }
diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp
index bdf4ee4605b..0a5af4a18ea 100644
--- a/source/gameengine/Expressions/InputParser.cpp
+++ b/source/gameengine/Expressions/InputParser.cpp
@@ -187,11 +187,10 @@ void CParser::NextSym()
 	//   sets the global variable cellcoord to the kind of operator
 	
 	errmsg = NULL;
-	while(ch == ' ' || ch == 0x9)
+	while (ch == ' ' || ch == 0x9)
 		NextCh();
 
-	switch(ch)
-	{
+	switch (ch) {
 		case '(':
 			sym = lbracksym; NextCh();
 			break;
@@ -359,7 +358,7 @@ STR_String CParser::Symbol2Str(int s)
 {
 	// returns a string representation of of symbol s,
 	// for use in Term when generating an error
-	switch(s) {
+	switch (s) {
 		case errorsym: return "error";
 		case lbracksym: return "(";
 		case rbracksym: return ")";
@@ -394,7 +393,7 @@ int CParser::Priority(int optorkind)
 {
 	// returns the priority of an operator
 	// higher number means higher priority
-	switch(optorkind) {
+	switch (optorkind) {
 		case OPor: return 1;
 		case OPand: return 2;
 		case OPgreater:
@@ -426,102 +425,103 @@ CExpression *CParser::Ex(int i)
 			opkind2 = opkind;
 			NextSym();
 			e2 = Ex(i + 1);
-			switch(opkind2) {
-			case OPmodulus: e1 = new COperator2Expr(VALUE_MOD_OPERATOR,e1, e2); break;
-			case OPplus: e1 = new COperator2Expr(VALUE_ADD_OPERATOR,e1, e2); break;
-			case OPminus: e1 = new COperator2Expr(VALUE_SUB_OPERATOR,e1, e2); break;
-			case OPtimes:	e1 = new COperator2Expr(VALUE_MUL_OPERATOR,e1, e2); break;
-			case OPdivide: e1 = new COperator2Expr(VALUE_DIV_OPERATOR,e1, e2); break;
-			case OPand: e1 = new COperator2Expr(VALUE_AND_OPERATOR,e1, e2); break;
-			case OPor: e1 = new COperator2Expr(VALUE_OR_OPERATOR,e1, e2); break;
-			case OPequal: e1 = new COperator2Expr(VALUE_EQL_OPERATOR,e1, e2); break;
-			case OPunequal: e1 = new COperator2Expr(VALUE_NEQ_OPERATOR,e1, e2); break;
-			case OPgreater: e1 = new COperator2Expr(VALUE_GRE_OPERATOR,e1, e2); break;
-			case OPless: e1 = new COperator2Expr(VALUE_LES_OPERATOR,e1, e2); break;
-			case OPgreaterequal: e1 = new COperator2Expr(VALUE_GEQ_OPERATOR,e1, e2); break;
-			case OPlessequal: e1 = new COperator2Expr(VALUE_LEQ_OPERATOR,e1, e2); break;
-			default: MT_assert(false);	break; // should not happen
+			switch (opkind2) {
+				case OPmodulus: e1 = new COperator2Expr(VALUE_MOD_OPERATOR,e1, e2); break;
+				case OPplus: e1 = new COperator2Expr(VALUE_ADD_OPERATOR,e1, e2); break;
+				case OPminus: e1 = new COperator2Expr(VALUE_SUB_OPERATOR,e1, e2); break;
+				case OPtimes:	e1 = new COperator2Expr(VALUE_MUL_OPERATOR,e1, e2); break;
+				case OPdivide: e1 = new COperator2Expr(VALUE_DIV_OPERATOR,e1, e2); break;
+				case OPand: e1 = new COperator2Expr(VALUE_AND_OPERATOR,e1, e2); break;
+				case OPor: e1 = new COperator2Expr(VALUE_OR_OPERATOR,e1, e2); break;
+				case OPequal: e1 = new COperator2Expr(VALUE_EQL_OPERATOR,e1, e2); break;
+				case OPunequal: e1 = new COperator2Expr(VALUE_NEQ_OPERATOR,e1, e2); break;
+				case OPgreater: e1 = new COperator2Expr(VALUE_GRE_OPERATOR,e1, e2); break;
+				case OPless: e1 = new COperator2Expr(VALUE_LES_OPERATOR,e1, e2); break;
+				case OPgreaterequal: e1 = new COperator2Expr(VALUE_GEQ_OPERATOR,e1, e2); break;
+				case OPlessequal: e1 = new COperator2Expr(VALUE_LEQ_OPERATOR,e1, e2); break;
+				default: MT_assert(false);	break; // should not happen
 			}
 		}
 	} else if (i == NUM_PRIORITY) {
-		if ((sym == opsym) 
-			&& ( (opkind == OPminus) || (opkind == OPnot) || (opkind == OPplus) ) 
-			)
+		if ((sym == opsym)
+		    && ( (opkind == OPminus) || (opkind == OPnot) || (opkind == OPplus) )
+		    )
 		{
 			NextSym();
-			switch(opkind) {
-			/* +1 is also a valid number! */
-			case OPplus: e1 = new COperator1Expr(VALUE_POS_OPERATOR, Ex(NUM_PRIORITY)); break;
-			case OPminus: e1 = new COperator1Expr(VALUE_NEG_OPERATOR, Ex(NUM_PRIORITY)); break;
-			case OPnot: e1 = new COperator1Expr(VALUE_NOT_OPERATOR, Ex(NUM_PRIORITY)); break;
-			default: {
-						// should not happen
-						e1 = Error("operator +, - or ! expected");
-					 }
+			switch (opkind) {
+				/* +1 is also a valid number! */
+				case OPplus: e1 = new COperator1Expr(VALUE_POS_OPERATOR, Ex(NUM_PRIORITY)); break;
+				case OPminus: e1 = new COperator1Expr(VALUE_NEG_OPERATOR, Ex(NUM_PRIORITY)); break;
+				case OPnot: e1 = new COperator1Expr(VALUE_NOT_OPERATOR, Ex(NUM_PRIORITY)); break;
+				default:
+				{
+					// should not happen
+					e1 = Error("operator +, - or ! expected");
+				}
 			}
 		}
 		else {
-			switch(sym) {
-			case constsym: {
-				switch(constkind) {
-				case booltype:
-					e1 = new CConstExpr(new CBoolValue(boolvalue));
-					break;
-				case inttype:
-					{
-						cInt temp;
-						temp = strtoll(const_as_string, NULL, 10); /* atoi is for int only */
-						e1 = new CConstExpr(new CIntValue(temp));
-						break;
-					}
-				case floattype:
-					{
-						double temp;
-						temp = atof(const_as_string);
-						e1 = new CConstExpr(new CFloatValue(temp));
-						break;
+			switch (sym) {
+				case constsym: {
+					switch (constkind) {
+						case booltype:
+							e1 = new CConstExpr(new CBoolValue(boolvalue));
+							break;
+						case inttype:
+						{
+							cInt temp;
+							temp = strtoll(const_as_string, NULL, 10); /* atoi is for int only */
+							e1 = new CConstExpr(new CIntValue(temp));
+							break;
+						}
+						case floattype:
+						{
+							double temp;
+							temp = atof(const_as_string);
+							e1 = new CConstExpr(new CFloatValue(temp));
+							break;
+						}
+						case stringtype:
+							e1 = new CConstExpr(new CStringValue(const_as_string,""));
+							break;
+						default :
+							MT_assert(false);
+							break;
 					}
-				case stringtype:
-					e1 = new CConstExpr(new CStringValue(const_as_string,""));
-					break;
-				default :
-					MT_assert(false);
+					NextSym();
 					break;
 				}
-				NextSym();
-				break;
-						   }
-			case lbracksym:
-				NextSym();
-				e1 = Ex(1);
-				Term(rbracksym);
-				break;
-			case ifsym:
-			{
-				CExpression *e3;
-				NextSym();
-				Term(lbracksym);
-				e1 = Ex(1);
-				Term(commasym);
-				e2 = Ex(1);
-				if (sym == commasym) {
+				case lbracksym:
 					NextSym();
-					e3 = Ex(1);
-				} else {
-					e3 = new CConstExpr(new CEmptyValue());
+					e1 = Ex(1);
+					Term(rbracksym);
+					break;
+				case ifsym:
+				{
+					CExpression *e3;
+					NextSym();
+					Term(lbracksym);
+					e1 = Ex(1);
+					Term(commasym);
+					e2 = Ex(1);
+					if (sym == commasym) {
+						NextSym();
+						e3 = Ex(1);
+					} else {
+						e3 = new CConstExpr(new CEmptyValue());
+					}
+					Term(rbracksym);
+					e1 = new CIfExpr(e1, e2, e3);
+					break;
 				}
-				Term(rbracksym);
-				e1 = new CIfExpr(e1, e2, e3);
-				break;
-			}
-			case idsym:
+				case idsym:
 				{
 					e1 = new CIdentifierExpr(const_as_string,m_identifierContext);
 					NextSym();
 					
 					break;
 				}
-			case errorsym:
+				case errorsym:
 				{
 					MT_assert(!e1);
 					STR_String errtext="[no info]";
@@ -530,7 +530,7 @@ CExpression *CParser::Ex(int i)
 						CValue* errmsgval = errmsg->Calculate();
 						errtext=errmsgval->GetText();
 						errmsgval->Release();
-					
+
 						//e1 = Error(errmsg->Calculate()->GetText());//new CConstExpr(errmsg->Calculate());
 						
 						if ( !(errmsg->Release()) )
@@ -545,11 +545,11 @@ CExpression *CParser::Ex(int i)
 
 					break;
 				}
-			default:
-				NextSym();
-				//return Error("Expression expected");
-				MT_assert(!e1);
-				e1 = Error("Expression expected");
+				default:
+					NextSym();
+					//return Error("Expression expected");
+					MT_assert(!e1);
+					e1 = Error("Expression expected");
 			}
 		}
 	}
diff --git a/source/gameengine/Expressions/IntValue.cpp b/source/gameengine/Expressions/IntValue.cpp
index 12d6e258ddf..cb6bc556bab 100644
--- a/source/gameengine/Expressions/IntValue.cpp
+++ b/source/gameengine/Expressions/IntValue.cpp
@@ -108,165 +108,160 @@ object and val
 	}
 }
 
-
-
-CValue* CIntValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val)
 /*
-pre: the type of val is dtype
-ret: a new object containing the result of applying operator op to val and
-this object
-*/
+ * pre: the type of val is dtype
+ * ret: a new object containing the result of applying operator op to val and
+ * this object
+ */
+CValue* CIntValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val)
 {
 	CValue *ret;
 	
-	switch(dtype) {
-	case VALUE_EMPTY_TYPE:
-	case VALUE_INT_TYPE:
+	switch (dtype) {
+		case VALUE_EMPTY_TYPE:
+		case VALUE_INT_TYPE:
 		{
 			switch (op) {
-			case VALUE_MOD_OPERATOR:
-				ret = new CIntValue (((CIntValue *) val)->GetInt() % m_int);
-				break;
-			case VALUE_ADD_OPERATOR:
-				ret = new CIntValue (((CIntValue *) val)->GetInt() + m_int);
-				break;
-			case VALUE_SUB_OPERATOR:
-				ret = new CIntValue (((CIntValue *) val)->GetInt() - m_int);
-				break;
-			case VALUE_MUL_OPERATOR:
-				ret = new CIntValue (((CIntValue *) val)->GetInt() * m_int);
-				break;
-			case VALUE_DIV_OPERATOR:
-				if (m_int == 0)
-				{
-					if (val->GetNumber() == 0)
-					{
-						ret = new CErrorValue("Not a Number");
-					} else
-					{
-						ret = new CErrorValue("Division by zero");
+				case VALUE_MOD_OPERATOR:
+					ret = new CIntValue (((CIntValue *) val)->GetInt() % m_int);
+					break;
+				case VALUE_ADD_OPERATOR:
+					ret = new CIntValue (((CIntValue *) val)->GetInt() + m_int);
+					break;
+				case VALUE_SUB_OPERATOR:
+					ret = new CIntValue (((CIntValue *) val)->GetInt() - m_int);
+					break;
+				case VALUE_MUL_OPERATOR:
+					ret = new CIntValue (((CIntValue *) val)->GetInt() * m_int);
+					break;
+				case VALUE_DIV_OPERATOR:
+					if (m_int == 0) {
+						if (val->GetNumber() == 0) {
+							ret = new CErrorValue("Not a Number");
+						}
+						else {
+							ret = new CErrorValue("Division by zero");
+						}
 					}
-				}
-				else
-					ret = new CIntValue (((CIntValue *) val)->GetInt() / m_int);
-				break;
-			case VALUE_EQL_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() == m_int);
-				break;
-			case VALUE_NEQ_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() != m_int);
-				break;
-			case VALUE_GRE_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() > m_int);
-				break;
-			case VALUE_LES_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() < m_int);
-				break;
-			case VALUE_GEQ_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() >= m_int);
-				break;
-			case VALUE_LEQ_OPERATOR:
-				ret = new CBoolValue(((CIntValue *) val)->GetInt() <= m_int);
-				break;
-			case VALUE_NEG_OPERATOR:
-				ret = new CIntValue (-m_int);
-				break;
-			case VALUE_POS_OPERATOR:
-				ret = new CIntValue (m_int);
-				break;
-			default:
-				ret = new CErrorValue("illegal operator. please send a bug report.");
-				break;
+					else
+						ret = new CIntValue (((CIntValue *) val)->GetInt() / m_int);
+					break;
+				case VALUE_EQL_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() == m_int);
+					break;
+				case VALUE_NEQ_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() != m_int);
+					break;
+				case VALUE_GRE_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() > m_int);
+					break;
+				case VALUE_LES_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() < m_int);
+					break;
+				case VALUE_GEQ_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() >= m_int);
+					break;
+				case VALUE_LEQ_OPERATOR:
+					ret = new CBoolValue(((CIntValue *) val)->GetInt() <= m_int);
+					break;
+				case VALUE_NEG_OPERATOR:
+					ret = new CIntValue (-m_int);
+					break;
+				case VALUE_POS_OPERATOR:
+					ret = new CIntValue (m_int);
+					break;
+				default:
+					ret = new CErrorValue("illegal operator. please send a bug report.");
+					break;
 			}
 			break;
 		}
-	case VALUE_FLOAT_TYPE:
+		case VALUE_FLOAT_TYPE:
 		{
 			switch (op) {
-			case VALUE_MOD_OPERATOR:
-				ret = new CFloatValue(fmod(((CFloatValue *) val)->GetFloat(), m_int));
-				break;
-			case VALUE_ADD_OPERATOR:
-				ret = new CFloatValue (((CFloatValue *) val)->GetFloat() + m_int);
-				break;
-			case VALUE_SUB_OPERATOR:
-				ret = new CFloatValue (((CFloatValue *) val)->GetFloat() - m_int);
-				break;
-			case VALUE_MUL_OPERATOR:
-				ret = new CFloatValue (((CFloatValue *) val)->GetFloat() * m_int);
-				break;
-			case VALUE_DIV_OPERATOR:
-				if (m_int == 0)
-					ret = new CErrorValue("Division by zero");
-				else
-					ret = new CFloatValue (((CFloatValue *) val)->GetFloat() / m_int);
-				break;
-			case VALUE_EQL_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() == m_int);
-				break;
-			case VALUE_NEQ_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() != m_int);
-				break;
-			case VALUE_GRE_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() > m_int);
-				break;
-			case VALUE_LES_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() < m_int);
-				break;
-			case VALUE_GEQ_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() >= m_int);
-				break;
-			case VALUE_LEQ_OPERATOR:
-				ret = new CBoolValue(((CFloatValue *) val)->GetFloat() <= m_int);
-				break;
-			default:
-				ret = new CErrorValue("illegal operator. please send a bug report.");
-				break;
+				case VALUE_MOD_OPERATOR:
+					ret = new CFloatValue(fmod(((CFloatValue *) val)->GetFloat(), m_int));
+					break;
+				case VALUE_ADD_OPERATOR:
+					ret = new CFloatValue (((CFloatValue *) val)->GetFloat() + m_int);
+					break;
+				case VALUE_SUB_OPERATOR:
+					ret = new CFloatValue (((CFloatValue *) val)->GetFloat() - m_int);
+					break;
+				case VALUE_MUL_OPERATOR:
+					ret = new CFloatValue (((CFloatValue *) val)->GetFloat() * m_int);
+					break;
+				case VALUE_DIV_OPERATOR:
+					if (m_int == 0)
+						ret = new CErrorValue("Division by zero");
+					else
+						ret = new CFloatValue (((CFloatValue *) val)->GetFloat() / m_int);
+					break;
+				case VALUE_EQL_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() == m_int);
+					break;
+				case VALUE_NEQ_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() != m_int);
+					break;
+				case VALUE_GRE_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() > m_int);
+					break;
+				case VALUE_LES_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() < m_int);
+					break;
+				case VALUE_GEQ_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() >= m_int);
+					break;
+				case VALUE_LEQ_OPERATOR:
+					ret = new CBoolValue(((CFloatValue *) val)->GetFloat() <= m_int);
+					break;
+				default:
+					ret = new CErrorValue("illegal operator. please send a bug report.");
+					break;
 			}
 			break;
 		}
-	case VALUE_STRING_TYPE:
+		case VALUE_STRING_TYPE:
 		{
-			switch(op) {
-			case VALUE_ADD_OPERATOR:
-				ret = new CStringValue(val->GetText() + GetText(),"");
-				break;
-			case VALUE_EQL_OPERATOR:
-			case VALUE_NEQ_OPERATOR:
-			case VALUE_GRE_OPERATOR:
-			case VALUE_LES_OPERATOR:
-			case VALUE_GEQ_OPERATOR:
-			case VALUE_LEQ_OPERATOR:
-				ret = new CErrorValue("[Cannot compare string with integer]" + op2str(op) + GetText());
-				break;
-			default:
-				ret =  new CErrorValue("[operator not allowed on strings]" + op2str(op) + GetText());
-				break;
+			switch (op) {
+				case VALUE_ADD_OPERATOR:
+					ret = new CStringValue(val->GetText() + GetText(),"");
+					break;
+				case VALUE_EQL_OPERATOR:
+				case VALUE_NEQ_OPERATOR:
+				case VALUE_GRE_OPERATOR:
+				case VALUE_LES_OPERATOR:
+				case VALUE_GEQ_OPERATOR:
+				case VALUE_LEQ_OPERATOR:
+					ret = new CErrorValue("[Cannot compare string with integer]" + op2str(op) + GetText());
+					break;
+				default:
+					ret =  new CErrorValue("[operator not allowed on strings]" + op2str(op) + GetText());
+					break;
 			}
 			break;
 		}
-	case VALUE_BOOL_TYPE:
-		ret =  new CErrorValue("[operator not valid on boolean and integer]" + op2str(op) + GetText());
-		break;
-		/*
+		case VALUE_BOOL_TYPE:
+			ret =  new CErrorValue("[operator not valid on boolean and integer]" + op2str(op) + GetText());
+			break;
+#if 0
 		case VALUE_EMPTY_TYPE:
 		{
-		switch(op) {
-		
-		  case VALUE_ADD_OPERATOR:
-		  ret = new CIntValue (m_int);
-		  break;
-		  case VALUE_SUB_OPERATOR:
-		  ret = new CIntValue (-m_int);
-		  break;
-		  default:
-		  {
-		  ret = new CErrorValue(op2str(op) +	GetText());
-		  }
-		  }
-		  break;
-		  }
-		*/
+			switch (op) {
+				case VALUE_ADD_OPERATOR:
+					ret = new CIntValue (m_int);
+					break;
+				case VALUE_SUB_OPERATOR:
+					ret = new CIntValue (-m_int);
+					break;
+				default:
+				{
+					ret = new CErrorValue(op2str(op) +	GetText());
+				}
+			}
+			break;
+		}
+#endif
 	case VALUE_ERROR_TYPE:
 		ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
 		break;
diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 6bb2f039b5c..bb1d0a31c1f 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -170,7 +170,7 @@ PyObject *PyObjectPlus::py_base_new(PyTypeObject *type, PyObject *args, PyObject
 	 *
 	 * */
 	base_type= Py_TYPE(base);
-	while(base_type && !BGE_PROXY_CHECK_TYPE(base_type))
+	while (base_type && !BGE_PROXY_CHECK_TYPE(base_type))
 		base_type= base_type->tp_base;
 
 	if (base_type==NULL || !BGE_PROXY_CHECK_TYPE(base_type)) {
@@ -1198,8 +1198,7 @@ void PyObjectPlus::ClearDeprecationWarning()
 	WarnLink *wlink_next;
 	WarnLink *wlink = GetDeprecationWarningLinkFirst();
 	
-	while(wlink)
-	{
+	while (wlink) {
 		wlink->warn_done= false; /* no need to NULL the link, its cleared before adding to the list next time round */
 		wlink_next= reinterpret_cast<WarnLink *>(wlink->link);
 		wlink->link= NULL;
diff --git a/source/gameengine/Expressions/StringValue.cpp b/source/gameengine/Expressions/StringValue.cpp
index 2e29a39222b..166125bc906 100644
--- a/source/gameengine/Expressions/StringValue.cpp
+++ b/source/gameengine/Expressions/StringValue.cpp
@@ -77,33 +77,34 @@ CValue* CStringValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue
 			ret = new CErrorValue(val->GetText() + op2str(op) +	GetText());
 		else
 			ret = new CStringValue(val->GetText() + GetText(),"");
-	} else {
-		
+	}
+	else {
 		if (dtype == VALUE_STRING_TYPE || dtype == VALUE_EMPTY_TYPE) {
-			switch(op) {
-			case VALUE_EQL_OPERATOR:
-				ret = new CBoolValue(val->GetText() == GetText());
-				break;
-			case VALUE_NEQ_OPERATOR:
-				ret = new CBoolValue(val->GetText() != GetText());
-				break;
-			case VALUE_GRE_OPERATOR:
-				ret = new CBoolValue(val->GetText() > GetText());
-				break;
-			case VALUE_LES_OPERATOR:
-				ret = new CBoolValue(val->GetText() < GetText());
-				break;
-			case VALUE_GEQ_OPERATOR:
-				ret = new CBoolValue(val->GetText() >= GetText());
-				break;
-			case VALUE_LEQ_OPERATOR:
-				ret = new CBoolValue(val->GetText() <= GetText());
-				break;
-			default:
-				ret =  new CErrorValue(val->GetText() + op2str(op) + "[operator not allowed on strings]");
-				break;
+			switch (op) {
+				case VALUE_EQL_OPERATOR:
+					ret = new CBoolValue(val->GetText() == GetText());
+					break;
+				case VALUE_NEQ_OPERATOR:
+					ret = new CBoolValue(val->GetText() != GetText());
+					break;
+				case VALUE_GRE_OPERATOR:
+					ret = new CBoolValue(val->GetText() > GetText());
+					break;
+				case VALUE_LES_OPERATOR:
+					ret = new CBoolValue(val->GetText() < GetText());
+					break;
+				case VALUE_GEQ_OPERATOR:
+					ret = new CBoolValue(val->GetText() >= GetText());
+					break;
+				case VALUE_LEQ_OPERATOR:
+					ret = new CBoolValue(val->GetText() <= GetText());
+					break;
+				default:
+					ret =  new CErrorValue(val->GetText() + op2str(op) + "[operator not allowed on strings]");
+					break;
 			}
-		} else {
+		}
+		else {
 			ret =  new CErrorValue(val->GetText() + op2str(op) + "[operator not allowed on strings]");
 		}
 	}
diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp
index ed13b0c8639..612de658ce9 100644
--- a/source/gameengine/Expressions/VectorValue.cpp
+++ b/source/gameengine/Expressions/VectorValue.cpp
@@ -96,61 +96,60 @@ 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());
 	}