aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-08-01 14:19:11 -0400
committerPaul Gilbert2015-08-01 14:19:11 -0400
commitaede69df3c495688cdacc17e2ca69cc28398f0e8 (patch)
tree804944260f1cb6706b234847d08db288d8fbad3a /engines/sherlock/objects.cpp
parent86e9bb1f65171721aca3ccc086df29011effe3d0 (diff)
downloadscummvm-rg350-aede69df3c495688cdacc17e2ca69cc28398f0e8.tar.gz
scummvm-rg350-aede69df3c495688cdacc17e2ca69cc28398f0e8.tar.bz2
scummvm-rg350-aede69df3c495688cdacc17e2ca69cc28398f0e8.zip
SHERLOCK: RT: Add check for resetting sequence in setObjSequence
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 6ef08c28cc..3149a20230 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -397,6 +397,10 @@ void BaseObject::setObjSequence(int seq, bool wait) {
Scene &scene = *_vm->_scene;
int checkFrame = _allow ? MAX_FRAME : FRAMES_END;
+ if (IS_ROSE_TATTOO && (seq == -1 || seq == 255))
+ // This means goto beginning
+ seq = 0;
+
if (seq >= 128) {
// Loop the sequence until the count exceeded
seq -= 128;