From dfd57406ff08deff0f15c9c6964c17d58d5a33f0 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sat, 28 Oct 2006 12:33:49 +0000 Subject: Fix sign issues, that caused combat issues in Elvira 1 svn-id: r24553 --- engines/agos/script.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 1186ebb14d..f1b87d6508 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -243,14 +243,16 @@ void AGOSEngine::o_notEq() { void AGOSEngine::o_gt() { // 15: is greater - uint tmp = getNextVarContents(); - setScriptCondition(tmp > getVarOrWord()); + int16 tmp1 = getNextVarContents(); + int16 tmp2 = getVarOrWord(); + setScriptCondition(tmp1 > tmp2); } void AGOSEngine::o_lt() { // 16: is less - uint tmp = getNextVarContents(); - setScriptCondition(tmp < getVarOrWord()); + int16 tmp1 = getNextVarContents(); + int16 tmp2 = getVarOrWord(); + setScriptCondition(tmp1 < tmp2); } void AGOSEngine::o_eqf() { @@ -267,14 +269,16 @@ void AGOSEngine::o_notEqf() { void AGOSEngine::o_ltf() { // 19: is greater f - uint tmp = getNextVarContents(); - setScriptCondition(tmp < getNextVarContents()); + int16 tmp1 = getNextVarContents(); + int16 tmp2 = getNextVarContents(); + setScriptCondition(tmp1 < tmp2); } void AGOSEngine::o_gtf() { // 20: is less f - uint tmp = getNextVarContents(); - setScriptCondition(tmp > getNextVarContents()); + int16 tmp1 = getNextVarContents(); + int16 tmp2 = getNextVarContents(); + setScriptCondition(tmp1 > tmp2); } void AGOSEngine::o_chance() { -- cgit v1.2.3