diff options
author | Filippos Karapetis | 2011-12-17 15:43:10 +0200 |
---|---|---|
committer | Filippos Karapetis | 2011-12-17 15:43:10 +0200 |
commit | b1edf2446251a0141fae38ad0bff42d2a639a1bf (patch) | |
tree | 55928301a8927425f08afde9857464e2ccebe98d /engines | |
parent | 7d38ba5619fbca6850c0d67eb9a2b43938654cf1 (diff) | |
download | scummvm-rg350-b1edf2446251a0141fae38ad0bff42d2a639a1bf.tar.gz scummvm-rg350-b1edf2446251a0141fae38ad0bff42d2a639a1bf.tar.bz2 scummvm-rg350-b1edf2446251a0141fae38ad0bff42d2a639a1bf.zip |
DREAMWEB: Fix a regression in businessMan(), and updated its comments
Diffstat (limited to 'engines')
-rw-r--r-- | engines/dreamweb/people.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp index 887a4452ad..e8446f0445 100644 --- a/engines/dreamweb/people.cpp +++ b/engines/dreamweb/people.cpp @@ -873,24 +873,23 @@ void DreamGenContext::mugger(ReelRoutine &routine) { } } +// Exiting the elevator of Sartain's industries, Sartain (the businessman) and +// two bodyguards are expecting Ryan. void DreamBase::businessMan(ReelRoutine &routine) { data.byte(kPointermode) = 0; data.word(kWatchingtime) = 2; - if (routine.reelPointer() == 2) { - // First - DreamBase::setupTimedUse(49, 30, 1, 68, 174); - return; - } + if (routine.reelPointer() == 2) + DreamBase::setupTimedUse(49, 30, 1, 68, 174); // First if (routine.reelPointer() == 95) { - // Bus combat won - end + // Businessman combat won - end data.byte(kPointermode) = 0; data.word(kWatchingtime) = 0; return; } if (routine.reelPointer() == 49) - return; // buscombatend + return; // Businessman combat end if (checkSpeed(routine)) { uint16 nextReelPointer = routine.reelPointer() + 1; @@ -904,7 +903,7 @@ void DreamBase::businessMan(ReelRoutine &routine) { data.byte(kCombatcount) = 0; nextReelPointer = 51; } else { - // No shield on bus + // No shield on businessman data.byte(kCombatcount)++; if (data.byte(kCombatcount) == 20) { data.byte(kCombatcount) = 0; @@ -912,7 +911,7 @@ void DreamBase::businessMan(ReelRoutine &routine) { } } } else { - // Bus combat won + // Businessman combat won if (nextReelPointer == 91) { turnPathOn(0); turnPathOn(1); |