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

[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:
a66f42fe20 SHERLOCK: RT: Minor differences in talk code


Commit: a66f42fe203ee3e7342a5317c83596e67aa2e6c9
    https://github.com/scummvm/scummvm/commit/a66f42fe203ee3e7342a5317c83596e67aa2e6c9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-02T23:11:25-04:00

Commit Message:
SHERLOCK: RT: Minor differences in talk code

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



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index eddc508..63bdc90 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -342,6 +342,11 @@ void Talk::talkTo(const Common::String &filename) {
 			Statement &statement = _statements[select];
 			doScript(_statements[select]._reply);
 
+			if (IS_ROSE_TATTOO) {
+				for (int idx = 0; idx < MAX_CHARACTERS; ++idx)
+					people[idx]._misc = 0;
+			}
+
 			if (_talkToAbort)
 				return;
 
@@ -401,20 +406,17 @@ void Talk::talkTo(const Common::String &filename) {
 			} else {
 				freeTalkVars();
 
-				if (!ui._lookScriptFlag) {
-					ui.drawInterface(2);
-
-					if (IS_SERRATED_SCALPEL) {
+				if (IS_SERRATED_SCALPEL) {
+					if (!ui._lookScriptFlag) {
+						ui.drawInterface(2);
 						ui._menuMode = STD_MODE;
 						ui._windowBounds.top = CONTROLS_Y1;
-					} else {
-						ui._menuMode = static_cast<Tattoo::TattooScene *>(_vm->_scene)->_labTableScene ?
-							LAB_MODE : STD_MODE;
 					}
-
-					ui.banishWindow();
+				} else {
+					ui._menuMode = static_cast<Tattoo::TattooScene *>(_vm->_scene)->_labTableScene ? LAB_MODE : STD_MODE;
 				}
 
+				ui.banishWindow();
 				break;
 			}
 		}
diff --git a/engines/sherlock/tattoo/widget_base.cpp b/engines/sherlock/tattoo/widget_base.cpp
index 856d745..0683245 100644
--- a/engines/sherlock/tattoo/widget_base.cpp
+++ b/engines/sherlock/tattoo/widget_base.cpp
@@ -45,6 +45,8 @@ void WidgetBase::summonWindow() {
 	// Add widget to the screen
 	if (!ui._fixedWidgets.contains(this))
 		ui._widgets.push_back(this);
+	ui._windowOpen = true;
+
 	_outsideMenu = false;
 
 	draw();
@@ -56,6 +58,7 @@ void WidgetBase::banishWindow() {
 	erase();
 	_surface.free();
 	ui._widgets.remove(this);
+	ui._windowOpen = false;
 }
 
 void WidgetBase::close() {