[Scummvm-cvs-logs] SF.net SVN: scummvm: [29103] scummvm/trunk/engines/touche/touche.cpp

[cyx at users.sourceforge.net]

Revision: 29103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29103&view=rev
Author:   cyx
Date:     2007-09-26 12:11:19 -0700 (Wed, 26 Sep 2007)

Log Message:
-----------
_currentObjectNum should also be set in text only talk mode

Modified Paths:
--------------
    scummvm/trunk/engines/touche/touche.cpp

Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp	2007-09-26 18:47:59 UTC (rev 29102)
+++ scummvm/trunk/engines/touche/touche.cpp	2007-09-26 19:11:19 UTC (rev 29103)
@@ -2195,23 +2195,15 @@
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.