[Scummvm-cvs-logs] scummvm master -> 92cda8c7be89cfb29ca8701c70f1387fb19e330c

dreammaster dreammaster at scummvm.org
Mon Aug 3 05:40:25 CEST 2015


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:
92cda8c7be SHERLOCK: RT: Stop running sprite scripts when an object is hidden


Commit: 92cda8c7be89cfb29ca8701c70f1387fb19e330c
    https://github.com/scummvm/scummvm/commit/92cda8c7be89cfb29ca8701c70f1387fb19e330c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-02T23:39:29-04:00

Commit Message:
SHERLOCK: RT: Stop running sprite scripts when an object is hidden

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 3149a20..e5d97c1 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -356,6 +356,10 @@ bool BaseObject::checkEndOfSequence() {
 			// Determine next sequence to use
 			int seq = _sequences[_frameNumber + 1];
 
+			// If the object has been turned off, we're going nowhere
+			if (IS_ROSE_TATTOO && (_type == HIDE_SHAPE || _type == HIDDEN || _type == REMOVE))
+				return false;
+
 			if (seq == 99) {
 				--_frameNumber;
 				screen._backBuffer1.transBlitFrom(*_imageFrame, _position);






More information about the Scummvm-git-logs mailing list