[Scummvm-cvs-logs] scummvm master -> 419d2c9ef8343801e25e23d5039e1bf73e314f7f

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
419d2c9ef8 SHERLOCK: RT: Fix for starting talk with characteres


Commit: 419d2c9ef8343801e25e23d5039e1bf73e314f7f
    https://github.com/scummvm/scummvm/commit/419d2c9ef8343801e25e23d5039e1bf73e314f7f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-12T14:04:04-04:00

Commit Message:
SHERLOCK: RT: Fix for starting talk with characteres

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.cpp
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index a8a38fa..aa0a2f4 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 0a5badc..4430022 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;