[Scummvm-git-logs] scummvm master -> 1fa1fc0e26332644e9ddb92fcc2da9474649c9fb

AndywinXp noreply at scummvm.org
Sat Jul 27 16:31:42 UTC 2024


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:
1fa1fc0e26 SCUMM: FT: Fix flashing computer text not appearing


Commit: 1fa1fc0e26332644e9ddb92fcc2da9474649c9fb
    https://github.com/scummvm/scummvm/commit/1fa1fc0e26332644e9ddb92fcc2da9474649c9fb
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-07-27T18:31:36+02:00

Commit Message:
SCUMM: FT: Fix flashing computer text not appearing

This fixes #15298:
"SCUMM: FT: End game console puzzles, flashing text not visible".

I missed this little bit from the disasm when I ported it over
years ago...

Changed paths:
    engines/scumm/string_v7.cpp


diff --git a/engines/scumm/string_v7.cpp b/engines/scumm/string_v7.cpp
index ccd7b132f28..e463d4fbb13 100644
--- a/engines/scumm/string_v7.cpp
+++ b/engines/scumm/string_v7.cpp
@@ -719,7 +719,7 @@ void ScummEngine_v7::displayDialog() {
 			if (c == 13) {
 				// New line
 				if (subtitleLine != subtitleBuffer) {
-					addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID(), false, false);
+					addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID(), _haveActorSpeechMsg, false);
 					subtitleLine = subtitleBuffer;
 				}
 
@@ -743,7 +743,7 @@ void ScummEngine_v7::displayDialog() {
 		}
 
 		if (subtitleLine != subtitleBuffer) {
-			addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID(), false, false);
+			addSubtitleToQueue(subtitleBuffer, subtitlePos, _charsetColor, _charset->getCurID(), _haveActorSpeechMsg, false);
 		}
 	} else {
 		_talkDelay = VAR(VAR_DEFAULT_TALK_DELAY);




More information about the Scummvm-git-logs mailing list