aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorGregory Montoir2007-09-26 19:11:19 +0000
committerGregory Montoir2007-09-26 19:11:19 +0000
commitaf9abde7dd29e9098a4b784da651eabfe4318663 (patch)
treec1ae6de33facfff4196d40b7af41edbf59be3f28 /engines
parentc89ef6060daf64603b74ec49fc9f87b2c5c4e64b (diff)
downloadscummvm-rg350-af9abde7dd29e9098a4b784da651eabfe4318663.tar.gz
scummvm-rg350-af9abde7dd29e9098a4b784da651eabfe4318663.tar.bz2
scummvm-rg350-af9abde7dd29e9098a4b784da651eabfe4318663.zip
_currentObjectNum should also be set in text only talk mode
svn-id: r29103
Diffstat (limited to 'engines')
-rw-r--r--engines/touche/touche.cpp12
1 files changed, 2 insertions, 10 deletions
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;