aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2006-10-28 12:33:49 +0000
committerTravis Howell2006-10-28 12:33:49 +0000
commitdfd57406ff08deff0f15c9c6964c17d58d5a33f0 (patch)
treef0908da066979f57c99186859f7719aad5374c3e
parentc85c37561d224de6740dca6afb982e359bc91425 (diff)
downloadscummvm-rg350-dfd57406ff08deff0f15c9c6964c17d58d5a33f0.tar.gz
scummvm-rg350-dfd57406ff08deff0f15c9c6964c17d58d5a33f0.tar.bz2
scummvm-rg350-dfd57406ff08deff0f15c9c6964c17d58d5a33f0.zip
Fix sign issues, that caused combat issues in Elvira 1
svn-id: r24553
-rw-r--r--engines/agos/script.cpp20
1 files 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() {