aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-12 14:04:04 -0400
committerPaul Gilbert2015-07-12 14:04:04 -0400
commit419d2c9ef8343801e25e23d5039e1bf73e314f7f (patch)
tree740ee03cb1e1f49a98a76732d29a2844724f9468
parentd07de8ca70d0eb430d328f2b0fa5154f67f72c1a (diff)
downloadscummvm-rg350-419d2c9ef8343801e25e23d5039e1bf73e314f7f.tar.gz
scummvm-rg350-419d2c9ef8343801e25e23d5039e1bf73e314f7f.tar.bz2
scummvm-rg350-419d2c9ef8343801e25e23d5039e1bf73e314f7f.zip
SHERLOCK: RT: Fix for starting talk with characteres
-rw-r--r--engines/sherlock/scalpel/scalpel_talk.cpp1
-rw-r--r--engines/sherlock/talk.cpp18
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;