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

[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:
e084437a6c SHERLOCK: RT: Fix Sherlock spinning when he finishes walking


Commit: e084437a6c53f208628c079ed206b335c5e6bd2a
    https://github.com/scummvm/scummvm/commit/e084437a6c53f208628c079ed206b335c5e6bd2a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-17T19:46:16-04:00

Commit Message:
SHERLOCK: RT: Fix Sherlock spinning when he finishes walking

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index d838f32..be6bd42 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -140,8 +140,8 @@ void BaseObject::checkObject() {
 	if (_seqTo) {
 		byte *ptr = &_sequences[_frameNumber];
 		if (*ptr == _seqTo) {
-			// The sequence is completed
-			*ptr = _seqTo + SEQ_TO_CODE + 128;	// Reset to normal
+			// The sequence is completed. Reset to normal
+			*ptr = _seqTo + (IS_ROSE_TATTOO ? 0 : SEQ_TO_CODE + 128);
 			_seqTo = 0;
 		} else {
 			// Continue doing sequence