aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-19 22:10:05 -0400
committerPaul Gilbert2015-07-19 22:10:05 -0400
commit6847da28b2469eb949cd342234cd525e8f1076c9 (patch)
tree5786e71ec8c8cd242d729b49523f74dc2945fe46
parent81125fd5d741fc0e032040634e64224d761fc37d (diff)
downloadscummvm-rg350-6847da28b2469eb949cd342234cd525e8f1076c9.tar.gz
scummvm-rg350-6847da28b2469eb949cd342234cd525e8f1076c9.tar.bz2
scummvm-rg350-6847da28b2469eb949cd342234cd525e8f1076c9.zip
SHERLOCK: RT: Fix sitting down at lab table
-rw-r--r--engines/sherlock/objects.cpp4
-rw-r--r--engines/sherlock/user_interface.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 2d939ce6cf..6ef08c28cc 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 9db29023c8..9df3f1dc24 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...");