diff options
Diffstat (limited to 'source/gameengine/Expressions')
28 files changed, 491 insertions, 449 deletions
diff --git a/source/gameengine/Expressions/BoolValue.cpp b/source/gameengine/Expressions/BoolValue.cpp index ee913877c96..e640923129a 100644 --- a/source/gameengine/Expressions/BoolValue.cpp +++ b/source/gameengine/Expressions/BoolValue.cpp @@ -104,37 +104,39 @@ 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]"); @@ -143,15 +145,16 @@ 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; @@ -159,8 +162,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/BoolValue.h b/source/gameengine/Expressions/BoolValue.h index b88c839a58e..64ac0266baf 100644 --- a/source/gameengine/Expressions/BoolValue.h +++ b/source/gameengine/Expressions/BoolValue.h @@ -61,4 +61,5 @@ private: #endif }; -#endif /* __BOOLVALUE_H__ */ +#endif // !defined __BOOLVALUE_H__ + diff --git a/source/gameengine/Expressions/ConstExpr.h b/source/gameengine/Expressions/ConstExpr.h index 768f2bbd10e..86d411cef26 100644 --- a/source/gameengine/Expressions/ConstExpr.h +++ b/source/gameengine/Expressions/ConstExpr.h @@ -51,4 +51,5 @@ private: #endif }; -#endif /* __CONSTEXPR_H__ */ +#endif // !defined(AFX_CONSTEXPR_H__061ECFC3_BE87_11D1_A51C_00A02472FC58__INCLUDED_) + diff --git a/source/gameengine/Expressions/EXP_C-Api.h b/source/gameengine/Expressions/EXP_C-Api.h index d73b0a209d4..4d43695f9b9 100644 --- a/source/gameengine/Expressions/EXP_C-Api.h +++ b/source/gameengine/Expressions/EXP_C-Api.h @@ -64,4 +64,5 @@ const char* EXP_GetText(EXP_ValueHandle); } #endif -#endif /* __EXP_C_API_H__ */ +#endif //__EXP_C_API_H__ + diff --git a/source/gameengine/Expressions/EmptyValue.h b/source/gameengine/Expressions/EmptyValue.h index 8eccb97e0f5..54920359f3f 100644 --- a/source/gameengine/Expressions/EmptyValue.h +++ b/source/gameengine/Expressions/EmptyValue.h @@ -45,4 +45,5 @@ public: #endif }; -#endif /* __EMPTYVALUE_H__ */ +#endif // !defined __EMPTYVALUE_H__ + diff --git a/source/gameengine/Expressions/ErrorValue.h b/source/gameengine/Expressions/ErrorValue.h index 0095528254e..12bc7c7ffcb 100644 --- a/source/gameengine/Expressions/ErrorValue.h +++ b/source/gameengine/Expressions/ErrorValue.h @@ -43,4 +43,5 @@ private: #endif }; -#endif /* __ERRORVALUE_H__ */ +#endif // !defined __ERRORVALUE_H__ + diff --git a/source/gameengine/Expressions/Expression.h b/source/gameengine/Expressions/Expression.h index d1b7eda43f0..5f5db505331 100644 --- a/source/gameengine/Expressions/Expression.h +++ b/source/gameengine/Expressions/Expression.h @@ -146,4 +146,5 @@ protected: #endif }; -#endif /* __EXPRESSION_H__ */ +#endif // !defined __EXPRESSION_H__ + diff --git a/source/gameengine/Expressions/FloatValue.cpp b/source/gameengine/Expressions/FloatValue.cpp index b7d7f528155..c9b59e52ee8 100644 --- a/source/gameengine/Expressions/FloatValue.cpp +++ b/source/gameengine/Expressions/FloatValue.cpp @@ -120,134 +120,138 @@ 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/FloatValue.h b/source/gameengine/Expressions/FloatValue.h index bc6a2d052d4..59311e5d373 100644 --- a/source/gameengine/Expressions/FloatValue.h +++ b/source/gameengine/Expressions/FloatValue.h @@ -54,4 +54,5 @@ protected: #endif }; -#endif /* __FLOATVALUE_H__ */ +#endif // !defined __FLOATVALUE_H__ + diff --git a/source/gameengine/Expressions/IdentifierExpr.h b/source/gameengine/Expressions/IdentifierExpr.h index 26eb3691378..58e75c4b02e 100644 --- a/source/gameengine/Expressions/IdentifierExpr.h +++ b/source/gameengine/Expressions/IdentifierExpr.h @@ -56,4 +56,5 @@ public: #endif }; -#endif /* __IDENTIFIEREXPR_H__ */ +#endif //__IDENTIFIEREXPR_H__ + diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/IfExpr.h index 80e35471d82..f8ed81168d0 100644 --- a/source/gameengine/Expressions/IfExpr.h +++ b/source/gameengine/Expressions/IfExpr.h @@ -16,8 +16,12 @@ * \ingroup expressions */ -#ifndef __IFEXPR_H__ -#define __IFEXPR_H__ +#if !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_) +#define AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_ + +#if defined(_MSC_VER) && _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 #include "Expression.h" @@ -51,4 +55,5 @@ public: #endif }; -#endif /* __IFEXPR_H__ */ +#endif // !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_) + diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp index 0a5af4a18ea..bdf4ee4605b 100644 --- a/source/gameengine/Expressions/InputParser.cpp +++ b/source/gameengine/Expressions/InputParser.cpp @@ -187,10 +187,11 @@ 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; @@ -358,7 +359,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 ")"; @@ -393,7 +394,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: @@ -425,103 +426,102 @@ 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; - } - case stringtype: - e1 = new CConstExpr(new CStringValue(const_as_string,"")); - break; - default : - MT_assert(false); - 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; } - NextSym(); + 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; - } - case lbracksym: - NextSym(); - e1 = Ex(1); - Term(rbracksym); + default : + MT_assert(false); break; - case ifsym: - { - CExpression *e3; + } + 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) { 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; + e3 = Ex(1); + } else { + e3 = new CConstExpr(new CEmptyValue()); } - case idsym: + Term(rbracksym); + e1 = new CIfExpr(e1, e2, e3); + break; + } + 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 0261a4a2d02..12d6e258ddf 100644 --- a/source/gameengine/Expressions/IntValue.cpp +++ b/source/gameengine/Expressions/IntValue.cpp @@ -108,160 +108,165 @@ object and val } } -/* - * 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) +/* +pre: the type of val is dtype +ret: a new object containing the result of applying operator op to val and +this object +*/ { 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; -#if 0 + case VALUE_BOOL_TYPE: + ret = new CErrorValue("[operator not valid on boolean and integer]" + op2str(op) + GetText()); + break; + /* 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; - } -#endif + 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; + } + */ case VALUE_ERROR_TYPE: ret = new CErrorValue(val->GetText() + op2str(op) + GetText()); break; @@ -286,7 +291,7 @@ cInt CIntValue::GetInt() double CIntValue::GetNumber() { - return (double) m_int; + return (float) m_int; } diff --git a/source/gameengine/Expressions/IntValue.h b/source/gameengine/Expressions/IntValue.h index 8411b09693c..e728467cc4e 100644 --- a/source/gameengine/Expressions/IntValue.h +++ b/source/gameengine/Expressions/IntValue.h @@ -69,4 +69,5 @@ private: #endif }; -#endif /* __INTVALUE_H__ */ +#endif // !defined __INTVALUE_H__ + diff --git a/source/gameengine/Expressions/KX_HashedPtr.h b/source/gameengine/Expressions/KX_HashedPtr.h index d822af38c44..866689ed203 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.h +++ b/source/gameengine/Expressions/KX_HashedPtr.h @@ -58,4 +58,5 @@ public: #endif }; -#endif /* __KX_HASHEDPTR_H__ */ +#endif //__KX_HASHEDPTR_H__ + diff --git a/source/gameengine/Expressions/KX_Python.h b/source/gameengine/Expressions/KX_Python.h index 62dd9a13dd4..4a7ce4d3fb7 100644 --- a/source/gameengine/Expressions/KX_Python.h +++ b/source/gameengine/Expressions/KX_Python.h @@ -79,4 +79,5 @@ #undef toupper #endif -#endif /* __KX_PYTHON_H__ */ +#endif // __KX_PYTHON_H__ + diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index 8cff5a01c0e..43f84d273fd 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -468,9 +468,9 @@ static PyObject *listvalue_buffer_concat(PyObject *self, PyObject *other) static int listvalue_buffer_contains(PyObject *self_v, PyObject *value) { - CListValue *self = static_cast<CListValue *>(BGE_PROXY_REF(self_v)); + CListValue *self= static_cast<CListValue *>(BGE_PROXY_REF(self_v)); - if (self == NULL) { + if (self==NULL) { PyErr_SetString(PyExc_SystemError, "val in CList, "BGE_PROXY_ERROR_MSG); return -1; } diff --git a/source/gameengine/Expressions/ListValue.h b/source/gameengine/Expressions/ListValue.h index 5240c54ae4e..20005088310 100644 --- a/source/gameengine/Expressions/ListValue.h +++ b/source/gameengine/Expressions/ListValue.h @@ -87,5 +87,5 @@ private: bool m_bReleaseContents; }; -#endif /* __LISTVALUE_H__ */ +#endif // !defined __LISTVALUE_H__ diff --git a/source/gameengine/Expressions/Operator1Expr.h b/source/gameengine/Expressions/Operator1Expr.h index 3dd76f773f2..13a1b16500a 100644 --- a/source/gameengine/Expressions/Operator1Expr.h +++ b/source/gameengine/Expressions/Operator1Expr.h @@ -16,8 +16,8 @@ * \ingroup expressions */ -#ifndef __OPERATOR1EXPR_H__ -#define __OPERATOR1EXPR_H__ +#if !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_) +#define AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_ #include "Expression.h" @@ -56,4 +56,5 @@ private: #endif }; -#endif /* __OPERATOR1EXPR_H__ */ +#endif // !defined(AFX_OPERATOR1EXPR_H__A1653901_BF41_11D1_A51C_00A02472FC58__INCLUDED_) + diff --git a/source/gameengine/Expressions/Operator2Expr.h b/source/gameengine/Expressions/Operator2Expr.h index 8c30b7cd634..23272930131 100644 --- a/source/gameengine/Expressions/Operator2Expr.h +++ b/source/gameengine/Expressions/Operator2Expr.h @@ -62,5 +62,5 @@ private: #endif }; -#endif /* __OPERATOR2EXPR_H__ */ +#endif // !defined __OPERATOR2EXPR_H__ diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index 77c76ca8153..6bb2f039b5c 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)) { @@ -259,7 +259,7 @@ void PyObjectPlus::py_base_dealloc(PyObject *self) // python wrapper * PyObjectPlus Methods -- Every class, even the abstract one should have a Methods ------------------------------*/ PyMethodDef PyObjectPlus::Methods[] = { - {NULL, NULL} /* Sentinel */ + {NULL, NULL} /* Sentinel */ }; #define BGE_PY_ATTR_INVALID (&(PyObjectPlus::Attributes[0])) @@ -486,8 +486,8 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef * static bool py_check_attr_float(float *var, PyObject *value, const PyAttributeDef *attrdef) { - float val = PyFloat_AsDouble(value); - if (val == -1.0f && PyErr_Occurred()) + double val = PyFloat_AsDouble(value); + if (val == -1.0 && PyErr_Occurred()) { PyErr_Format(PyExc_TypeError, "expected float value for attribute \"%s\"", attrdef->m_name); return false; @@ -664,13 +664,13 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt { float *var = reinterpret_cast<float*>(ptr); ptr += sizeof(float); - float val = PyFloat_AsDouble(item); - if (val == -1.0f && PyErr_Occurred()) + double val = PyFloat_AsDouble(item); + if (val == -1.0 && PyErr_Occurred()) { PyErr_Format(PyExc_TypeError, "expected a float for attribute \"%s\"", attrdef->m_name); goto UNDO_AND_ERROR; } - else if (attrdef->m_clamp) + else if (attrdef->m_clamp) { if (val < attrdef->m_fmin) val = attrdef->m_fmin; @@ -985,10 +985,10 @@ int PyObjectPlus::py_set_attrdef(PyObject *self_py, PyObject *value, const PyAtt for (int i=0; i<3; i++) { item = PySequence_GetItem(value, i); /* new ref */ - float val = PyFloat_AsDouble(item); + double val = PyFloat_AsDouble(item); Py_DECREF(item); item = NULL; - if (val == -1.0f && PyErr_Occurred()) + if (val == -1.0 && PyErr_Occurred()) { PyErr_Format(PyExc_TypeError, "expected a sequence of 3 floats for attribute \"%s\"", attrdef->m_name); goto RESTORE_AND_ERROR; @@ -1198,7 +1198,8 @@ 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/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h index 83b7c8c8771..005bf2f6cb2 100644 --- a/source/gameengine/Expressions/PyObjectPlus.h +++ b/source/gameengine/Expressions/PyObjectPlus.h @@ -548,7 +548,7 @@ public: \ #define Py_HeaderPtr \ public: \ -#endif /* WITH_CXX_GUARDEDALLOC */ +#endif // WITH_CXX_GUARDEDALLOC #endif @@ -633,4 +633,4 @@ public: PyObject *PyUnicode_From_STR_String(const STR_String& str); #endif -#endif /* __PYOBJECTPLUS_H__ */ +#endif // __PYOBJECTPLUS_H__ diff --git a/source/gameengine/Expressions/StringValue.cpp b/source/gameengine/Expressions/StringValue.cpp index 166125bc906..2e29a39222b 100644 --- a/source/gameengine/Expressions/StringValue.cpp +++ b/source/gameengine/Expressions/StringValue.cpp @@ -77,34 +77,33 @@ 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/StringValue.h b/source/gameengine/Expressions/StringValue.h index 22d433455ec..bc102c6e203 100644 --- a/source/gameengine/Expressions/StringValue.h +++ b/source/gameengine/Expressions/StringValue.h @@ -45,7 +45,7 @@ public: virtual PyObject* ConvertValueToPython() { return PyUnicode_From_STR_String(m_strString); } -#endif /* WITH_PYTHON */ +#endif // WITH_PYTHON private: // data member @@ -57,4 +57,5 @@ private: #endif }; -#endif /* __STRINGVALUE_H__ */ +#endif + diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index c4af3255f4a..e0c4daeccd0 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -16,13 +16,13 @@ * \ingroup expressions */ +#if defined(WIN32) && !defined(FREE_WINDOWS) +#pragma warning (disable:4786) +#endif //WIN32 + #ifndef __VALUE_H__ #define __VALUE_H__ -#ifdef _MSC_VER -# pragma warning (disable:4786) -#endif - #include <map> // array functionality for the propertylist #include "STR_String.h" // STR_String class @@ -53,6 +53,14 @@ using namespace std; #define assertd(exp) ((void)NULL) #endif + +#ifndef USE_PRAGMA_ONCE +#ifdef WIN32 + #pragma once + +#endif //WIN32 +#endif + enum VALUE_OPERATOR { VALUE_MOD_OPERATOR, // % @@ -225,7 +233,7 @@ public: static PyObject *pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef); virtual PyObject *ConvertKeysToPython( void ); -#endif /* WITH_PYTHON */ +#endif // WITH_PYTHON @@ -431,4 +439,5 @@ protected: #endif }; -#endif /* __VALUE_H__ */ +#endif // !defined _VALUEBASECLASS_H + 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()); } diff --git a/source/gameengine/Expressions/VectorValue.h b/source/gameengine/Expressions/VectorValue.h index 9b9f9612810..b7afa61d4dd 100644 --- a/source/gameengine/Expressions/VectorValue.h +++ b/source/gameengine/Expressions/VectorValue.h @@ -90,4 +90,5 @@ protected: #endif }; -#endif /* __VECTORVALUE_H__ */ +#endif // !defined __VECTORVALUE_H__ + diff --git a/source/gameengine/Expressions/VoidValue.h b/source/gameengine/Expressions/VoidValue.h index e97278b3142..a1a82f8aa65 100644 --- a/source/gameengine/Expressions/VoidValue.h +++ b/source/gameengine/Expressions/VoidValue.h @@ -78,3 +78,4 @@ public: }; #endif /* __VOIDVALUE_H__ */ + |