Synchronise game engine with Tuhopuu2 tree.

5 files changed, 13 insertions, 13 deletions

diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index 673dda5db2d..380befa51bd 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -226,7 +226,7 @@ CListValue::~CListValue()
 {
 
 	if (m_bReleaseContents) {
-		for (int i=0;i<m_pValueArray.size();i++) {
+		for (unsigned int i=0;i<m_pValueArray.size();i++) {
 			m_pValueArray[i]->Release();
 		}
 	}
@@ -261,7 +261,7 @@ CValue* CListValue::GetReplica() {
 	replica->m_bReleaseContents=true; // for copy, complete array is copied for now...
 	// copy all values
 	int numelements = m_pValueArray.size();
-	int i=0;
+	unsigned int i=0;
 	replica->m_pValueArray.resize(numelements);
 	for (i=0;i<m_pValueArray.size();i++)
 		replica->m_pValueArray[i] = m_pValueArray[i]->GetReplica();
@@ -297,7 +297,7 @@ void CListValue::Remove(int i)
 
 void CListValue::ReleaseAndRemoveAll()
 {
-	for (int i=0;i<m_pValueArray.size();i++)
+	for (unsigned int i=0;i<m_pValueArray.size();i++)
 		m_pValueArray[i]->Release();
 	m_pValueArray.clear();//.Clear();
 }
diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h
index eeb8e2b0585..4a1deb0eca3 100644
--- a/source/gameengine/Expressions/Operator1Expr.h
+++ b/source/gameengine/Expressions/Operator1Expr.h
@@ -26,7 +26,7 @@ class COperator1Expr : public CExpression
 
 public:
 	virtual bool MergeExpression(CExpression* otherexpr);
-	void virtual BroadcastOperators(VALUE_OPERATOR op);
+	virtual void BroadcastOperators(VALUE_OPERATOR op);
 
 	virtual unsigned char GetExpressionID() { return COPERATOR1EXPRESSIONID;};
 	CExpression* CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
diff --git a/source/gameengine/Expressions/Operator2Expr.cpp b/source/gameengine/Expressions/Operator2Expr.cpp
index 2bd3f074b0b..da0a3e9a9f9 100644
--- a/source/gameengine/Expressions/Operator2Expr.cpp
+++ b/source/gameengine/Expressions/Operator2Expr.cpp
@@ -30,10 +30,10 @@
 
 COperator2Expr::COperator2Expr(VALUE_OPERATOR op, CExpression *lhs, CExpression *rhs)
 : 	
-m_cached_calculate(NULL),
-m_op(op),
+m_rhs(rhs),
 m_lhs(lhs),
-m_rhs(rhs)
+m_cached_calculate(NULL),
+m_op(op)
 /*
 pre:
 effect: constucts a COperator2Expr with op, lhs and rhs in it
@@ -43,9 +43,9 @@ effect: constucts a COperator2Expr with op, lhs and rhs in it
 }
 
 COperator2Expr::COperator2Expr():
-m_cached_calculate(NULL),
+m_rhs(NULL),
 m_lhs(NULL),
-m_rhs(NULL)
+m_cached_calculate(NULL)
 
 /*
 pre:
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index ecbd2d9d6d8..58f07790f6a 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -179,8 +179,8 @@ CValue::CValue()
 : 
 #endif //NO_EXP_PYTHON_EMBEDDING
 	
-m_refcount(1),
-m_pNamedPropertyArray(NULL)
+m_pNamedPropertyArray(NULL),
+m_refcount(1)
 /*
 pre: false
 effect: constucts a CValue
diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/VoidValue.h
index bec611d62ce..53fbd8b4f01 100644
--- a/source/gameengine/Expressions/VoidValue.h
+++ b/source/gameengine/Expressions/VoidValue.h
@@ -44,8 +44,8 @@ class CVoidValue : public CPropValue
 
 public:
 	/// Construction/destruction
-	CVoidValue()																: m_pAnything(NULL),	m_bDeleteOnDestruct(false) { }
-	CVoidValue(void * voidptr, bool bDeleteOnDestruct, AllocationTYPE alloctype)	: m_pAnything(voidptr), m_bDeleteOnDestruct(bDeleteOnDestruct) { if (alloctype == STACKVALUE) CValue::DisableRefCount(); }
+	CVoidValue()																: m_bDeleteOnDestruct(false), m_pAnything(NULL)	 { }
+	CVoidValue(void * voidptr, bool bDeleteOnDestruct, AllocationTYPE alloctype)	: m_bDeleteOnDestruct(bDeleteOnDestruct), m_pAnything(voidptr)  { if (alloctype == STACKVALUE) CValue::DisableRefCount(); }
 	virtual				~CVoidValue();											// Destruct void value, delete memory if we're owning it
 
 	/// Value -> String or number