[Scummvm-cvs-logs] scummvm master -> aede69df3c495688cdacc17e2ca69cc28398f0e8

[dreammaster]

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:
aede69df3c SHERLOCK: RT: Add check for resetting sequence in setObjSequence


Commit: aede69df3c495688cdacc17e2ca69cc28398f0e8
    https://github.com/scummvm/scummvm/commit/aede69df3c495688cdacc17e2ca69cc28398f0e8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-01T14:19:11-04:00

Commit Message:
SHERLOCK: RT: Add check for resetting sequence in setObjSequence

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 6ef08c2..3149a20 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;