[Scummvm-cvs-logs] scummvm master -> 2a96ee48d466e4404ebd8feb8a3bf608a19121ce

bluegr md5 at scummvm.org
Thu Dec 15 22:23:00 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2a96ee48d4 DREAMWEB: Fix regression in helicopter()


Commit: 2a96ee48d466e4404ebd8feb8a3bf608a19121ce
    https://github.com/scummvm/scummvm/commit/2a96ee48d466e4404ebd8feb8a3bf608a19121ce
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-15T13:21:57-08:00

Commit Message:
DREAMWEB: Fix regression in helicopter()

Changed paths:
    engines/dreamweb/people.cpp



diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index e060df9..8b68c52 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;
 	}






More information about the Scummvm-git-logs mailing list