eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix color setters

This commit is contained in:
Alexander Batalov 2022-10-28 10:35:22 +03:00
parent 1bbd586cbb
commit 01f264e0c2
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/interpreter_lib.cc
View File

@ -1465,8 +1465,9 @@ static void opSetTextColor(Program* program)
} }
for (int arg = 0; arg < 3; arg++) { for (int arg = 0; arg < 3; arg++) {
if (((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT && (value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_INT) if ((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT
|| value[arg].floatValue == 0.0) { && (value[arg].opcode & VALUE_TYPE_MASK) == VALUE_TYPE_INT
&& value[arg].integerValue != 0) {
programFatalError("Invalid type given to settextcolor"); programFatalError("Invalid type given to settextcolor");
} }
} }
@ -1492,8 +1493,9 @@ static void opSayOptionColor(Program* program)
} }
for (int arg = 0; arg < 3; arg++) { for (int arg = 0; arg < 3; arg++) {
if (((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT && (value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_INT) if ((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT
|| value[arg].floatValue == 0.0) { && (value[arg].opcode & VALUE_TYPE_MASK) == VALUE_TYPE_INT
&& value[arg].integerValue != 0) {
programFatalError("Invalid type given to sayoptioncolor"); programFatalError("Invalid type given to sayoptioncolor");
} }
} }
@ -1519,8 +1521,9 @@ static void opSayReplyColor(Program* program)
} }
for (int arg = 0; arg < 3; arg++) { for (int arg = 0; arg < 3; arg++) {
if (((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT && (value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_INT) if ((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT
|| value[arg].floatValue == 0.0) { && (value[arg].opcode & VALUE_TYPE_MASK) == VALUE_TYPE_INT
&& value[arg].integerValue != 0) {
programFatalError("Invalid type given to sayreplycolor"); programFatalError("Invalid type given to sayreplycolor");
} }
} }
@ -1546,8 +1549,9 @@ static void opSetHighlightColor(Program* program)
} }
for (int arg = 0; arg < 3; arg++) { for (int arg = 0; arg < 3; arg++) {
if (((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT && (value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_INT) if ((value[arg].opcode & VALUE_TYPE_MASK) != VALUE_TYPE_FLOAT
|| value[arg].floatValue == 0.0) { && (value[arg].opcode & VALUE_TYPE_MASK) == VALUE_TYPE_INT
&& value[arg].integerValue != 0) {
programFatalError("Invalid type given to sayreplycolor"); programFatalError("Invalid type given to sayreplycolor");
} }
} }