[Scummvm-git-logs] scummvm master -> 94bb74000f4aecc36c3efab84cd620ac005eeaf6

[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:
94bb74000f KYRA: (LOK) - minor text speed fix adjustment


Commit: 94bb74000f4aecc36c3efab84cd620ac005eeaf6
    https://github.com/scummvm/scummvm/commit/94bb74000f4aecc36c3efab84cd620ac005eeaf6
Author: athrxx (athrxx at scummvm.org)
Date: 2024-07-05T14:39:42+02:00

Commit Message:
KYRA: (LOK) - minor text speed fix adjustment

(ignore chat text display duration when speech is enabled)

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 a183bf90bfd..a723b1055df 100644
--- a/engines/kyra/text/text_lok.cpp
+++ b/engines/kyra/text/text_lok.cpp
@@ -35,8 +35,9 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int chatDuration, const ch
 	uint8 currPage;
 
 	uint32 timeToEnd = strlen(chatStr) * 8 * _tickLength + _system->getMillis();
+	bool textOnly = textEnabled() && vocFile == - 1;
 
-	if (textEnabled() && !speechEnabled() && chatDuration != -1) {
+	if (textOnly && chatDuration != -1) {
 		switch (_configTextspeed) {
 		case 0:
 			chatDuration *= 2;
@@ -100,7 +101,7 @@ void KyraEngine_LoK::waitForChatToFinish(int vocFile, int chatDuration, const ch
 		_animator->copyChangedObjectsForward(0);
 		updateTextFade();
 
-		if (((chatDuration < (int)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && printText) || (vocFile != -1 && !snd_voiceIsPlaying()))
+		if (((chatDuration < (int)(_system->getMillis() - timeAtStart)) && chatDuration != -1 && printText && textOnly) || (!textOnly && !snd_voiceIsPlaying()))
 			break;
 
 		uint32 nextTime = loopStart + _tickLength;