aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/riven_stacks
diff options
context:
space:
mode:
authorBastien Bouclet2017-08-10 20:07:34 +0200
committerBastien Bouclet2017-08-10 20:07:34 +0200
commit22ed7eb399bdef15e296007c1f51de5fb9d5558e (patch)
treebb4f9a15d256c320793ca0845ebeb4e292d50f44 /engines/mohawk/riven_stacks
parentcf9646e72b0e6e6c8908c1e04542c447e0d4bd5d (diff)
downloadscummvm-rg350-22ed7eb399bdef15e296007c1f51de5fb9d5558e.tar.gz
scummvm-rg350-22ed7eb399bdef15e296007c1f51de5fb9d5558e.tar.bz2
scummvm-rg350-22ed7eb399bdef15e296007c1f51de5fb9d5558e.zip
MOHAWK: Riven: Neutralize the timer when moving the Ytram trap up
Fixes #10103.
Diffstat (limited to 'engines/mohawk/riven_stacks')
-rw-r--r--engines/mohawk/riven_stacks/bspit.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/mohawk/riven_stacks/bspit.cpp b/engines/mohawk/riven_stacks/bspit.cpp
index b1ba5abd7b..824269a989 100644
--- a/engines/mohawk/riven_stacks/bspit.cpp
+++ b/engines/mohawk/riven_stacks/bspit.cpp
@@ -279,6 +279,12 @@ void BSpit::checkYtramCatch(bool playSound) {
uint32 &ytramTime = _vm->_vars["bytramtime"];
+ // The trap has been moved back up.
+ // You can't catch those sneaky Ytrams that way.
+ if (ytramTime == 0) {
+ return;
+ }
+
// If the trap still has not gone off, reinstall our timer
// This is in case you set the trap, walked away, and returned
if (_vm->getTotalPlayTime() < ytramTime) {