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

[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:
ef492b351b SHERLOCK: RT: Changes for doScript method ending code


Commit: ef492b351b5762f24de2762de21360f16e93e98f
    https://github.com/scummvm/scummvm/commit/ef492b351b5762f24de2762de21360f16e93e98f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-05T22:22:30-04:00

Commit Message:
SHERLOCK: RT: Changes for doScript method ending code

Changed paths:
    engines/sherlock/sherlock.cpp
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 6e2ed44..7653dc0 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -188,7 +188,6 @@ void SherlockEngine::sceneLoop() {
 
 	_scene->freeScene();
 	_people->freeWalk();
-
 }
 
 void SherlockEngine::handleInput() {
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ffc55db..c350560 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -879,11 +879,13 @@ void Talk::doScript(const Common::String &script) {
 		}
 
 		pullSequence();
-		if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
-			people.clearTalking();
 
-		if (IS_ROSE_TATTOO)
+		if (IS_SERRATED_SCALPEL) {
+			if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
+				people.clearTalking();
+		} else {
 			static_cast<Tattoo::TattooPeople *>(_vm->_people)->pullNPCPaths();
+		}
 	}
 }