aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/tattoo/tattoo_talk.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-05 17:10:34 -0400
committerPaul Gilbert2015-07-05 17:10:34 -0400
commit24663029035ec9bfd228e2dada39235656ac1daa (patch)
tree91e8f4799189efc121e537abedb5b2a01b073465 /engines/sherlock/tattoo/tattoo_talk.cpp
parentcae493523c8f1d3c7ae4e5da28c12a4633baf4be (diff)
downloadscummvm-rg350-24663029035ec9bfd228e2dada39235656ac1daa.tar.gz
scummvm-rg350-24663029035ec9bfd228e2dada39235656ac1daa.tar.bz2
scummvm-rg350-24663029035ec9bfd228e2dada39235656ac1daa.zip
SHERLOCK: RT: Fixes to display talk window
Diffstat (limited to 'engines/sherlock/tattoo/tattoo_talk.cpp')
-rw-r--r--engines/sherlock/tattoo/tattoo_talk.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index d0c4bdc3b0..51704e7023 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -198,9 +198,15 @@ void TattooTalk::talkInterface(const byte *&str) {
_wait = true;
}
-void TattooTalk::openTalkWindow() {
+void TattooTalk::showTalk() {
+ TattooPeople &people = *(TattooPeople *)_vm->_people;
+
+ _sequenceStack.clear();
+ people.setListenSequence(_talkTo, 129);
+
_talkWidget.load();
_talkWidget.summonWindow();
+ _talkWidget.refresh();
}
OpcodeReturn TattooTalk::cmdSwitchSpeaker(const byte *&str) {
@@ -861,14 +867,6 @@ OpcodeReturn TattooTalk::cmdWalkHomesAndNPCToCoords(const byte *&str) {
return RET_SUCCESS;
}
-void TattooTalk::showTalk() {
- TattooPeople &people = *(TattooPeople *)_vm->_people;
-
- _sequenceStack.clear();
- people.setListenSequence(_talkTo, 129);
- _talkWidget.refresh();
-}
-
} // End of namespace Tattoo
} // End of namespace Sherlock