diff options
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/talk.cpp | 18 |
2 files changed, 3 insertions, 16 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index a8a38fa6b4..aa0a2f48b4 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -837,7 +837,6 @@ void ScalpelTalk::showTalk() { ui._windowOpen = true; } - } } // End of namespace Scalpel diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 0a5badc234..4430022a85 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -441,9 +441,7 @@ void Talk::talk(int objNum) { Events &events = *_vm->_events; People &people = *_vm->_people; Scene &scene = *_vm->_scene; - Screen &screen = *_vm->_screen; UserInterface &ui = *_vm->_ui; - //Object &obj = scene._bgShapes[objNum]; ui._windowBounds.top = CONTROLS_Y; ui._infoFlag = true; @@ -519,21 +517,11 @@ void Talk::talk(int objNum) { pullSequence(); } } else { - drawInterface(); - - events._pressed = events._released = false; _talkIndex = select; - displayTalk(false); - ui._selector = ui._oldSelector = -1; - - if (!ui._slideWindows) { - screen.slamRect(Common::Rect(0, CONTROLS_Y, SHERLOCK_SCREEN_WIDTH, - SHERLOCK_SCREEN_HEIGHT)); - } else { - ui.summonWindow(); - } + showTalk(); - ui._windowOpen = true; + // Break out of loop now that we're waiting for player input + events.setCursor(ARROW); } _talkToFlag = -1; |