forked from ground/ground
Fix conflict
This commit is contained in:
@@ -1432,9 +1432,9 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (right->type == INT) {
|
if (right->type == INT) {
|
||||||
result += right->data.intVal;
|
result -= right->data.intVal;
|
||||||
} else if (right->type == DOUBLE) {
|
} else if (right->type == DOUBLE) {
|
||||||
result += right->data.doubleVal;
|
result -= right->data.doubleVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
addVariable(scope->variables, in->args.args[2].value.refName, createDoubleGroundValue(result));
|
addVariable(scope->variables, in->args.args[2].value.refName, createDoubleGroundValue(result));
|
||||||
|
|||||||
Reference in New Issue
Block a user