aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-17 08:17:19 -0400
committerPaul Gilbert2015-07-17 08:17:19 -0400
commit9044e70bb95e78f75c86ae1f4508c9f5bba65a88 (patch)
tree5e2c819b8ee30db92d0919661f219a196314800c
parentd31884e8a16189efcda9e853f10e79c1e03a6337 (diff)
downloadscummvm-rg350-9044e70bb95e78f75c86ae1f4508c9f5bba65a88.tar.gz
scummvm-rg350-9044e70bb95e78f75c86ae1f4508c9f5bba65a88.tar.bz2
scummvm-rg350-9044e70bb95e78f75c86ae1f4508c9f5bba65a88.zip
SHERLOCK: RT: Don't show object tooltips when talk window active
-rw-r--r--engines/sherlock/tattoo/tattoo_talk.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index e176d38ef1..8303fd42ad 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -201,6 +201,7 @@ void TattooTalk::talkInterface(const byte *&str) {
void TattooTalk::showTalk() {
TattooPeople &people = *(TattooPeople *)_vm->_people;
+ TattooUserInterface &ui = *(TattooUserInterface *)_vm->_ui;
_sequenceStack.clear();
people.setListenSequence(_talkTo, 129);
@@ -208,6 +209,9 @@ void TattooTalk::showTalk() {
_talkWidget.load();
_talkWidget.summonWindow();
_talkWidget.refresh();
+
+ if (ui._menuMode != MESSAGE_MODE)
+ ui._menuMode = TALK_MODE;
}
OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) {