[Scummvm-cvs-logs] CVS: scummvm/queen talk.cpp,1.84,1.85

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv21608/queen

Modified Files:
	talk.cpp 
Log Message:
fix 'conversation options still displayed after hitting esc' bug (noticeable in plane when speaking to Sparky)

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- talk.cpp	16 Jan 2004 20:26:30 -0000	1.84
+++ talk.cpp	20 Jan 2004 22:35:53 -0000	1.85
@@ -312,19 +312,19 @@
 
 	if (_vm->logic()->gameState(cutawayGameState) == cutawayTestValue) {
 		getString(ptr, cutawayFilename, 20);
-
-		//CR 2 - 7/3/95, If we're executing a cutaway scene, then make sure
-		// Joe can talk, so set TALKQUIT to 0 just in case we exit on the
-		// line that set's the cutaway game states.
-		_vm->input()->talkQuitReset();
+		if (cutawayFilename[0]) {
+			//CR 2 - 7/3/95, If we're executing a cutaway scene, then make sure
+			// Joe can talk, so set TALKQUIT to 0 just in case we exit on the
+			// line that set's the cutaway game states.
+			_vm->input()->talkQuitReset();
+		}
 	}
-
 	if (_vm->input()->talkQuit()) {
 		if (_oldSelectedSentenceIndex > 0)
 			selectedValue(_oldSelectedSentenceIndex, _oldSelectedSentenceValue);
 		_vm->input()->talkQuitReset();
 		_vm->display()->clearTexts(0, 198);
-		speak(_talkString[15], NULL, "JOE0015");
+		_vm->logic()->makeJoeSpeak(15, false);
 	}
 	else {
 		setHasTalkedTo();