[Scummvm-cvs-logs] scummvm master -> 86c3c8b4620f3841ba587790bdad9f262d1ed339

[wjp]

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:
86c3c8b462 DREAMWEB: Fix regressions in helicopter and poolGuard


Commit: 86c3c8b4620f3841ba587790bdad9f262d1ed339
    https://github.com/scummvm/scummvm/commit/86c3c8b4620f3841ba587790bdad9f262d1ed339
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-16T02:02:51-08:00

Commit Message:
DREAMWEB: Fix regressions in helicopter and poolGuard

Changed paths:
    engines/dreamweb/people.cpp



diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index fd408b7..aeb0b5d 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -842,11 +842,7 @@ void DreamGenContext::helicopter(ReelRoutine &routine) {
 					nextReelPointer = 9;
 				}
 			}
-		} else {
-			// Not waiting helicopter
-			data.byte(kPointermode) = 0;
-			data.word(kWatchingtime) = 2;
-		}
+		} 
 
 		routine.setReelPointer(nextReelPointer);
 	}
@@ -929,12 +925,12 @@ void DreamGenContext::businessMan(ReelRoutine &routine) {
 		} else if (nextReelPointer == 15) {
 			nextReelPointer--;
 			if (data.byte(kLastweapon) == 3) {
-				// Shield bonus
+				// Shield on bus
 				data.byte(kLastweapon) = (byte)-1;
 				data.byte(kCombatcount) = 0;
 				nextReelPointer = 51;
 			} else {
-				// No shield bonus
+				// No shield on bus
 				data.byte(kCombatcount)++;
 				if (data.byte(kCombatcount) == 20) {
 					data.byte(kCombatcount) = 0;
@@ -1048,19 +1044,19 @@ void DreamGenContext::poolGuard(ReelRoutine &routine) {
 					}
 				}
 			}
-		}
-
-		nextReelPointer--;
-
-		if (data.byte(kLastweapon) == 2) {
-			// Axe on pool
-			data.byte(kLastweapon) = (byte)-1;
-			nextReelPointer = 122;
 		} else {
-			data.byte(kCombatcount)++;
-			if (data.byte(kCombatcount) == 40) {
-				data.byte(kCombatcount) = 0;
-				nextReelPointer = 195;
+			nextReelPointer--;
+
+			if (data.byte(kLastweapon) == 2) {
+				// Axe on pool
+				data.byte(kLastweapon) = (byte)-1;
+				nextReelPointer = 122;
+			} else {
+				data.byte(kCombatcount)++;
+				if (data.byte(kCombatcount) == 40) {
+					data.byte(kCombatcount) = 0;
+					nextReelPointer = 195;
+				}
 			}
 		}