mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 13:06:59 -04:00
== and != default to strings instead of ints
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@331 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -238,12 +238,14 @@ void instrUnary (UnaryInstructionType i, ScriptValueP& a) {
|
||||
|
||||
// operator on strings or doubles or ints
|
||||
#define OPERATOR_SDI(OP) \
|
||||
if (at == SCRIPT_STRING || bt == SCRIPT_STRING) { \
|
||||
if (at == SCRIPT_STRING || bt == SCRIPT_STRING) { \
|
||||
a = to_script(a->toString() OP b->toString()); \
|
||||
} else if (at == SCRIPT_DOUBLE || bt == SCRIPT_DOUBLE) { \
|
||||
a = to_script((double)*a OP (double)*b); \
|
||||
} else { \
|
||||
} else if (at == SCRIPT_INT || bt == SCRIPT_INT ) { \
|
||||
a = to_script((int)*a OP (int)*b); \
|
||||
} else { \
|
||||
a = to_script(a->toString() OP b->toString()); \
|
||||
} \
|
||||
break
|
||||
|
||||
|
||||
Reference in New Issue
Block a user