diff options
| author | Gregory Montoir | 2011-02-17 15:02:34 +0100 |
|---|---|---|
| committer | Gregory Montoir | 2011-02-18 15:18:44 +0100 |
| commit | d9140ab62683c624a8f2fc294df027cc94c01c84 (patch) | |
| tree | 14336c2494e2430d5111d63949d9156dcaeb660e | |
| parent | da77a057d17c3985632e704b5cff88ef6729beed (diff) | |
| download | scummvm-rg350-d9140ab62683c624a8f2fc294df027cc94c01c84.tar.gz scummvm-rg350-d9140ab62683c624a8f2fc294df027cc94c01c84.tar.bz2 scummvm-rg350-d9140ab62683c624a8f2fc294df027cc94c01c84.zip | |
TUCKER: fix #2628056 - Text Dialogue is out of sync
always synchronize text with speech sound. Note, some
subtitles present in the datafiles are inconsistent
(written text different from spoken).
| -rw-r--r-- | engines/tucker/tucker.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index 6e766aac16..ad10b5b73a 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -556,13 +556,7 @@ void TuckerEngine::mainLoop() { if (_inputKeys[kInputKeyToggleTextSpeech]) { _inputKeys[kInputKeyToggleTextSpeech] = false; if ((_gameFlags & kGameFlagNoSubtitles) == 0) { - if (_displaySpeechText) { - _displaySpeechText = false; -// kDefaultCharSpeechSoundCounter = 1; - } else { - _displaySpeechText = true; -// kDefaultCharSpeechSoundCounter = 70; - } + _displaySpeechText = !_displaySpeechText; ConfMan.setBool("subtitles", _displaySpeechText); } } @@ -2889,7 +2883,11 @@ void TuckerEngine::updateCharSpeechSound(bool displayText) { if (_charSpeechSoundCounter == 0) { return; } - --_charSpeechSoundCounter; + if (_displaySpeechText) { + _charSpeechSoundCounter = 0; + } else { + --_charSpeechSoundCounter; + } if (_charSpeechSoundCounter == 0) { _charSpeechSoundCounter = isSpeechSoundPlaying() ? 1 : 0; if (_charSpeechSoundCounter == 0) { |