[Scummvm-git-logs] scummvm master -> 90bba347d4c7281ab3d81696d0fb5e1939d4ef26

[criezy]

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

Summary:
90bba347d4 CRUISE: Fix TTS encoding, empty text queuing, and logo speech


Commit: 90bba347d4c7281ab3d81696d0fb5e1939d4ef26
    https://github.com/scummvm/scummvm/commit/90bba347d4c7281ab3d81696d0fb5e1939d4ef26
Author: ellm135 (ellm13531 at gmail.com)
Date: 2025-06-21T23:04:06+01:00

Commit Message:
CRUISE: Fix TTS encoding, empty text queuing, and logo speech

Changed paths:
    engines/cruise/cruise.cpp
    engines/cruise/overlay.cpp


diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp
index e09c6578acb..9e3a9775dca 100644
--- a/engines/cruise/cruise.cpp
+++ b/engines/cruise/cruise.cpp
@@ -95,7 +95,9 @@ Common::Error CruiseEngine::run() {
 		ttsMan->enable(ConfMan.getBool("tts_enabled"));
 		ttsMan->setLanguage(ConfMan.get("language"));
 
-		if (getLanguage() == Common::RU_RUS) {
+		if (getLanguage() == Common::FR_FRA || getLanguage() == Common::IT_ITA) {
+			_ttsTextEncoding = Common::CodePage::kWindows1252;
+		} else if (getLanguage() == Common::RU_RUS) {
 			_ttsTextEncoding = Common::CodePage::kDos866;
 		} else {
 			_ttsTextEncoding = Common::CodePage::kDos850;
@@ -218,6 +220,10 @@ void CruiseEngine::pauseEngine(bool pause) {
 }
 
 void CruiseEngine::sayText(const Common::String &text, Common::TextToSpeechManager::Action action) {
+	if (text.empty() && action == Common::TextToSpeechManager::QUEUE) {
+		return;
+	}
+
 	Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
 	// _previousSaid is used to prevent the TTS from looping when sayText is called inside a loop,
 	// for example when the cursor stays on a menu item. Without it when the text ends it would speak
diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp
index 27889958401..016b6d7c26c 100644
--- a/engines/cruise/overlay.cpp
+++ b/engines/cruise/overlay.cpp
@@ -143,10 +143,6 @@ int loadOverlay(const char *scriptName) {
 		scriptNotLoadedBefore = true;
 	}
 
-	if (!strcmp(scriptName, "LOGO")) {	// Logo when game is first booted up (or restarted)
-		_vm->sayText("Delphine Software\nCinematique", Common::TextToSpeechManager::QUEUE);
-	}
-
 	if (overlayTable[scriptIdx].alreadyLoaded) {
 		return (scriptIdx);
 	}