aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-12-15 23:21:22 +0200
committerFilippos Karapetis2011-12-15 23:21:57 +0200
commit2a96ee48d466e4404ebd8feb8a3bf608a19121ce (patch)
treeb74e395f7e383a949f132db65807e1b0f97b223e
parent772aecf5f8c5ac69dd3755bb948c6ebdb5a11f94 (diff)
downloadscummvm-rg350-2a96ee48d466e4404ebd8feb8a3bf608a19121ce.tar.gz
scummvm-rg350-2a96ee48d466e4404ebd8feb8a3bf608a19121ce.tar.bz2
scummvm-rg350-2a96ee48d466e4404ebd8feb8a3bf608a19121ce.zip
DREAMWEB: Fix regression in helicopter()
-rw-r--r--engines/dreamweb/people.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index e060df9fcc..8b68c52d3e 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -871,7 +871,7 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
if (nextReelPointer == 53) {
// Before killing helicopter
data.byte(kCombatcount)++;
- if (data.byte(kCombatcount) != 8)
+ if (data.byte(kCombatcount) >= 8)
data.byte(kMandead) = 2;
nextReelPointer = 49;
} else if (nextReelPointer == 9) {
@@ -898,10 +898,11 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
showGameReel(&routine);
routine.mapX = data.byte(kMapx);
- if (routine.reelPointer() == 9 && data.byte(kCombatcount) != 7) {
+ if (routine.reelPointer() < 9 && data.byte(kCombatcount) >= 7) {
data.byte(kPointermode) = 2;
data.word(kWatchingtime) = 0;
} else {
+ // Not waiting helicopter
data.byte(kPointermode) = 0;
data.word(kWatchingtime) = 2;
}