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

[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:
c98d5f0d2d SHERLOCK: RT: Don't run secondary scripts if an anim is active


Commit: c98d5f0d2df0a91ace7b6026c0c764873bc32299
    https://github.com/scummvm/scummvm/commit/c98d5f0d2df0a91ace7b6026c0c764873bc32299
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-05T23:48:59-04:00

Commit Message:
SHERLOCK: RT: Don't run secondary scripts if an anim is active

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index c350560..6d8bfee 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -29,6 +29,7 @@
 #include "sherlock/scalpel/scalpel_user_interface.h"
 #include "sherlock/tattoo/tattoo.h"
 #include "sherlock/tattoo/tattoo_people.h"
+#include "sherlock/tattoo/tattoo_scene.h"
 #include "sherlock/tattoo/tattoo_talk.h"
 
 namespace Sherlock {
@@ -150,7 +151,11 @@ void Talk::talkTo(const Common::String &filename) {
 
 	// If there any canimations currently running, or a portrait is being cleared,
 	// save the filename for later executing when the canimation is done
-	if (scene._canimShapes.size() > 0 || people._clearingThePortrait) {
+	bool ongoingAnim = scene._canimShapes.size() > 0;
+	if (IS_ROSE_TATTOO) {
+		ongoingAnim = static_cast<Tattoo::TattooScene *>(_vm->_scene)->_activeCAnim.active();
+	}
+	if (ongoingAnim || people._clearingThePortrait) {
 		// Make sure we're not in the middle of a script
 		if (!_scriptMoreFlag) {
 			_scriptName = filename;