diff options
| author | Paul Gilbert | 2015-08-02 23:39:29 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-02 23:39:29 -0400 |
| commit | 92cda8c7be89cfb29ca8701c70f1387fb19e330c (patch) | |
| tree | c58071aff9e1f23dec5a8f200404fbfb100f16ac | |
| parent | a66f42fe203ee3e7342a5317c83596e67aa2e6c9 (diff) | |
| download | scummvm-rg350-92cda8c7be89cfb29ca8701c70f1387fb19e330c.tar.gz scummvm-rg350-92cda8c7be89cfb29ca8701c70f1387fb19e330c.tar.bz2 scummvm-rg350-92cda8c7be89cfb29ca8701c70f1387fb19e330c.zip | |
SHERLOCK: RT: Stop running sprite scripts when an object is hidden
| -rw-r--r-- | engines/sherlock/objects.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index 3149a20230..e5d97c1279 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); |