[Scummvm-git-logs] scummvm master -> fd97ca71f076024aa7f11de15f61562d9775d1f1

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fd97ca71f0 KYRA: LoK - Fix chat duration


Commit: fd97ca71f076024aa7f11de15f61562d9775d1f1
    https://github.com/scummvm/scummvm/commit/fd97ca71f076024aa7f11de15f61562d9775d1f1
Author: Alexander Korotkov (akorotkov at postgresql.org)
Date: 2024-07-05T14:08:18+02:00

Commit Message:
KYRA: LoK - Fix chat duration

When both subtitles and voice are enabled use voice duration as in
the original game.

Changed paths:
    engines/kyra/text/text_lok.cpp


diff --git a/engines/kyra/text/text_lok.cpp b/engines/kyra/text/text_lok.cpp
index 748f31dcaef..a183bf90bfd 100644
--- a/engines/kyra/text/text_lok.cpp
+++ b/engines/kyra/text/text_lok.cpp
@@ -100,7 +100,7 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int chatDuration, const ch
 		_animator->copyChangedObjectsForward(0);
 		updateTextFade();
 
-		if (((chatDuration < (int)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && printText) || (!printText && !snd_voiceIsPlaying()))
+		if (((chatDuration < (int)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && printText) || (vocFile != -1 && !snd_voiceIsPlaying()))
 			break;
 
 		uint32 nextTime = loopStart + _tickLength;