Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Expressions')
-rw-r--r--source/gameengine/Expressions/IntValue.cpp3
-rw-r--r--source/gameengine/Expressions/ListValue.cpp7
-rw-r--r--source/gameengine/Expressions/Operator1Expr.cpp3
-rw-r--r--source/gameengine/Expressions/Operator2Expr.cpp3
-rw-r--r--source/gameengine/Expressions/VectorValue.cpp9
5 files changed, 16 insertions, 9 deletions
diff --git a/source/gameengine/Expressions/IntValue.cpp b/source/gameengine/Expressions/IntValue.cpp
index cf0aed181bb..c03c97311c7 100644
--- a/source/gameengine/Expressions/IntValue.cpp
+++ b/source/gameengine/Expressions/IntValue.cpp
@@ -308,7 +308,8 @@ const STR_String & CIntValue::GetText()
-CValue* CIntValue::GetReplica() {
+CValue* CIntValue::GetReplica()
+{
CIntValue* replica = new CIntValue(*this);
replica->ProcessReplica();
replica->m_pstrRep = NULL;
diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp
index cdd87235fd2..4e048b1a875 100644
--- a/source/gameengine/Expressions/ListValue.cpp
+++ b/source/gameengine/Expressions/ListValue.cpp
@@ -71,7 +71,8 @@ const STR_String & CListValue::GetText()
-CValue* CListValue::GetReplica() {
+CValue* CListValue::GetReplica()
+{
CListValue* replica = new CListValue(*this);
replica->ProcessReplica();
@@ -214,7 +215,7 @@ CValue* CListValue::Calc(VALUE_OPERATOR op,CValue *val)
//assert(false); // todo: implement me!
static int error_printed = 0;
if (error_printed==0) {
- fprintf(stderr, "CValueList::Calc not yet implimented\n");
+ fprintf(stderr, "CValueList::Calc not yet implemented\n");
error_printed = 1;
}
return NULL;
@@ -227,7 +228,7 @@ CValue* CListValue::CalcFinal(VALUE_DATA_TYPE dtype,
//assert(false); // todo: implement me!
static int error_printed = 0;
if (error_printed==0) {
- fprintf(stderr, "CValueList::CalcFinal not yet implimented\n");
+ fprintf(stderr, "CValueList::CalcFinal not yet implemented\n");
error_printed = 1;
}
return NULL;
diff --git a/source/gameengine/Expressions/Operator1Expr.cpp b/source/gameengine/Expressions/Operator1Expr.cpp
index 4e93ee0cb09..98228dfbe7d 100644
--- a/source/gameengine/Expressions/Operator1Expr.cpp
+++ b/source/gameengine/Expressions/Operator1Expr.cpp
@@ -103,7 +103,8 @@ bool COperator1Expr::NeedsRecalculated()
return m_lhs->NeedsRecalculated();
}
-CExpression* COperator1Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks) {
+CExpression* COperator1Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks)
+{
CExpression* newlhs = m_lhs->CheckLink(brokenlinks);
diff --git a/source/gameengine/Expressions/Operator2Expr.cpp b/source/gameengine/Expressions/Operator2Expr.cpp
index 11a509e59d0..f11d0670d15 100644
--- a/source/gameengine/Expressions/Operator2Expr.cpp
+++ b/source/gameengine/Expressions/Operator2Expr.cpp
@@ -197,7 +197,8 @@ bool COperator2Expr::NeedsRecalculated()
-CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks) {
+CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks)
+{
// if both children are 'dead', return NULL
// if only one child is alive, return that child
// if both childresn are alive, return this
diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp
index 96cc5b48338..07a2743b19f 100644
--- a/source/gameengine/Expressions/VectorValue.cpp
+++ b/source/gameengine/Expressions/VectorValue.cpp
@@ -47,7 +47,8 @@ CVectorValue::CVectorValue(float x,float y,float z, AllocationTYPE alloctype)
m_vec[KX_Z] = m_transformedvec[KX_Z] = z;
}
-CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype) {
+CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype)
+{
SetCustomFlag1(false);//FancyOutput=false;
@@ -64,7 +65,8 @@ CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctyp
SetName(name);
}
-CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype) {
+CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype)
+{
SetCustomFlag1(false);//FancyOutput=false;
@@ -201,7 +203,8 @@ const STR_String & CVectorValue::GetText()
return gstrVectorStr;
}
-CValue* CVectorValue::GetReplica() {
+CValue* CVectorValue::GetReplica()
+{
CVectorValue* replica = new CVectorValue(*this);
replica->ProcessReplica();
return replica;