From af9abde7dd29e9098a4b784da651eabfe4318663 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Wed, 26 Sep 2007 19:11:19 +0000
Subject: _currentObjectNum should also be set in text only talk mode

svn-id: r29103
---
 engines/touche/touche.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp
index 4bc8cc037e..ce1a26c788 100644
--- a/engines/touche/touche.cpp
+++ b/engines/touche/touche.cpp
@@ -2195,23 +2195,15 @@ int ToucheEngine::updateKeyCharTalk(int skipFlag) {
 	if (_keyCharTalkCounter) {
 		--_keyCharTalkCounter;
 	}
+	_currentObjectNum = talkingKeyChar;
 	if (_speechPlaying) {
 		_flagsTable[297] = 0;
+		_keyCharTalkCounter = 1;
 		if (_talkTextMode == kTalkModeVoiceOnly) {
-			_keyCharTalkCounter = 0;
-		}
-		_currentObjectNum = talkingKeyChar;
-		if (_keyCharTalkCounter == 0) {
-			_keyCharTalkCounter = 1;
-		}
-	}
-	if (_talkTextMode == kTalkModeVoiceOnly) {
-		if (_speechPlaying) {
 			return 1;
 		}
 	}
 	if (_keyCharTalkCounter != 0) {
-		_currentObjectNum = talkingKeyChar;
 		_talkTextDisplayed = true;
 		int textHeight = kTextHeight;
 		y -= kTextHeight;
-- 
cgit v1.2.3