[Scummvm-cvs-logs] scummvm master -> 6847da28b2469eb949cd342234cd525e8f1076c9

[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:
6847da28b2 SHERLOCK: RT: Fix sitting down at lab table


Commit: 6847da28b2469eb949cd342234cd525e8f1076c9
    https://github.com/scummvm/scummvm/commit/6847da28b2469eb949cd342234cd525e8f1076c9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-19T22:10:05-04:00

Commit Message:
SHERLOCK: RT: Fix sitting down at lab table

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



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 2d939ce..6ef08c2 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -508,6 +508,10 @@ int BaseObject::checkNameForCodes(const Common::String &name, FixedTextActionId
 			break;
 		}
 
+		case 'V':
+			// Do nothing for Verb codes. This is only a flag for Inventory syntax
+			break;
+
 		default:
 			if (ch >= '0' && ch <= '9') {
 				scene._goToScene = atoi(name.c_str() + 1);
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index 9db2902..9df3f1d 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -179,7 +179,7 @@ void UserInterface::checkAction(ActionType &action, int objNum, FixedTextActionI
 			}
 
 			// Unless we're leaving the scene, print a "Done" message unless the printed flag has been set
-			if (scene._goToScene != 1 && !printed && !talk._talkToAbort) {
+			if (IS_SERRATED_SCALPEL && scene._goToScene != 1 && !printed && !talk._talkToAbort) {
 				_infoFlag = true;
 				clearInfo();
 				screen.print(Common::Point(0, INFO_LINE + 1), COL_INFO_FOREGROUND, "Done...");