asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11307 from godotengine/revert-11078-fix-10717

Browse source 
Revert "Don't allow division by false (zero)"
This commit is contained in:
Thomas Herzog 2017-09-15 23:39:26 +02:00 committed by GitHub
commit 57926f8091
1 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/variant_op.cpp
View file

@ -670,34 +670,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, const Variant &
switch (p_a.type) { switch (p_a.type) {
DEFAULT_OP_FAIL(NIL); DEFAULT_OP_FAIL(NIL);
case BOOL: { DEFAULT_OP_NUM(/, BOOL, _bool);
switch (p_b.type) {
case BOOL: {
int64_t b = p_b._data._bool;
if (b == 0) {
r_valid = false;
_RETURN("Division By False");
}
_RETURN(p_a._data._bool / b);
} break;
case INT: {
int64_t b = p_b._data._int;
if (b == 0) {
r_valid = false;
_RETURN("Division By Zero");
}
_RETURN(p_a._data._bool / b);
} break;
case REAL: _RETURN(p_a._data._bool / p_b._data._real);
default: {}
}
r_valid = false;
return;
};
case INT: { case INT: {
switch (p_b.type) { switch (p_b.type) {
case BOOL: { case BOOL: {