archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BGE: Fix for [#34398] "«illegal operator» in Expression Controller" reported by Andrey Kashlak (andreymal)

Browse Source 
The expressions system now supports the not operator on ints and floats.
This commit is contained in:
Mitchell Stokes
2013-07-22 22:46:17 +00:00
parent 1b85328545
commit 33e52d0df4
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/gameengine/Expressions/IntValue.cpp
View File

@@ -96,7 +96,7 @@ object and val
return new CIntValue (-m_int);
break;
case VALUE_NOT_OPERATOR:
return new CErrorValue (op2str(op) + "only allowed on booleans");
return new CBoolValue (m_int == 0);
break;
case VALUE_AND_OPERATOR:
case VALUE_OR_OPERATOR:
@@ -170,7 +170,11 @@ CValue* CIntValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *v
case VALUE_POS_OPERATOR:
ret = new CIntValue (m_int);
break;
case VALUE_NOT_OPERATOR:
ret = new CBoolValue(m_int == 0);
break;
default:
printf("Found op: %d\n", op);
ret = new CErrorValue("illegal operator. please send a bug report.");
break;
}
@@ -215,6 +219,9 @@ CValue* CIntValue::CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *v
case VALUE_LEQ_OPERATOR:
ret = new CBoolValue(((CFloatValue *) val)->GetFloat() <= m_int);
break;
case VALUE_NOT_OPERATOR:
ret = new CBoolValue(m_int == 0);
break;
default:
ret = new CErrorValue("illegal operator. please send a bug report.");
break;