[Scummvm-cvs-logs] scummvm master -> 5deb89689075c07284123084fbf56bde64d5ee56

[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:
5deb896890 SHERLOCK: RT: Reset _startSeq when an object sequence is changed


Commit: 5deb89689075c07284123084fbf56bde64d5ee56
    https://github.com/scummvm/scummvm/commit/5deb89689075c07284123084fbf56bde64d5ee56
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-15T12:16:47-04:00

Commit Message:
SHERLOCK: RT: Reset _startSeq when an object sequence is changed

Changed paths:
    engines/sherlock/objects.cpp
    engines/sherlock/people.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index ab14132..c89915f 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -492,6 +492,7 @@ void BaseObject::setObjSequence(int seq, bool wait) {
 	if (idx >= checkFrame)
 		idx = 0;
 	_frameNumber = idx;
+	_startSeq = idx;
 
 	if (wait) {
 		seqCc = idx;
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 9cd4a16..d91d7fa 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -197,6 +197,7 @@ void People::reset() {
 		
 		p._imageFrame = nullptr;
 		p._frameNumber = 1;
+		p._startSeq = 0;
 		p._delta = Point32(0, 0);
 		p._oldPosition = Common::Point(0, 0);
 		p._oldSize = Common::Point(0, 0);