diff options
author | Willem Jan Palenstijn | 2011-12-16 10:36:07 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-12-16 11:02:51 +0100 |
commit | 86c3c8b4620f3841ba587790bdad9f262d1ed339 (patch) | |
tree | 94c9d0e6105a60fff351cc2f3ebb3074944ca694 | |
parent | 84be5b04465fa241b1982f943df3d17a1a1ced1a (diff) | |
download | scummvm-rg350-86c3c8b4620f3841ba587790bdad9f262d1ed339.tar.gz scummvm-rg350-86c3c8b4620f3841ba587790bdad9f262d1ed339.tar.bz2 scummvm-rg350-86c3c8b4620f3841ba587790bdad9f262d1ed339.zip |
DREAMWEB: Fix regressions in helicopter and poolGuard
-rw-r--r-- | engines/dreamweb/people.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index fd408b772c..aeb0b5db22 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; + } } } |