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

[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:
fa51095f7c SHERLOCK: RT: Fix filled beaker not being a hotspot in lab scene


Commit: fa51095f7c213e0442410f88677a77f36d6b511c
    https://github.com/scummvm/scummvm/commit/fa51095f7c213e0442410f88677a77f36d6b511c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-26T14:56:11-04:00

Commit Message:
SHERLOCK: RT: Fix filled beaker not being a hotspot in lab scene

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a1a003d..d259182 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -403,8 +403,14 @@ void Talk::talkTo(const Common::String &filename) {
 
 				if (!ui._lookScriptFlag) {
 					ui.drawInterface(2);
-					ui._menuMode = STD_MODE;
-					ui._windowBounds.top = CONTROLS_Y1;
+
+					if (IS_SERRATED_SCALPEL) {
+						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();
 				}