[Scummvm-git-logs] scummvm master -> 22ed7eb399bdef15e296007c1f51de5fb9d5558e

bgK bastien.bouclet at gmail.com
Thu Aug 10 20:10:27 CEST 2017


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:
22ed7eb399 MOHAWK: Riven: Neutralize the timer when moving the Ytram trap up


Commit: 22ed7eb399bdef15e296007c1f51de5fb9d5558e
    https://github.com/scummvm/scummvm/commit/22ed7eb399bdef15e296007c1f51de5fb9d5558e
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2017-08-10T20:07:34+02:00

Commit Message:
MOHAWK: Riven: Neutralize the timer when moving the Ytram trap up

Fixes #10103.

Changed paths:
    engines/mohawk/riven_stacks/bspit.cpp


diff --git a/engines/mohawk/riven_stacks/bspit.cpp b/engines/mohawk/riven_stacks/bspit.cpp
index b1ba5ab..824269a 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) {





More information about the Scummvm-git-logs mailing list