[Scummvm-git-logs] scummvm master -> 7d4ca02f597b60b6af2c0b50fd49850383982455

[lephilousophe]

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

Summary:
dfd39d9d80 CGE2: Sfinx: Fix crash in builds without TTS
7d4ca02f59 CGE2: Sfinx: Do not ignore TTS settings in exit dialog


Commit: dfd39d9d801110bbc304887e17872e1121ee53ec
    https://github.com/scummvm/scummvm/commit/dfd39d9d801110bbc304887e17872e1121ee53ec
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-07-09T08:02:47+02:00

Commit Message:
CGE2: Sfinx: Fix crash in builds without TTS

Check if the TTS manager is available / not nullptr before
using it in the exit dialog.

Fixes #14383

Changed paths:
    engines/cge2/vmenu.cpp


diff --git a/engines/cge2/vmenu.cpp b/engines/cge2/vmenu.cpp
index ae15a321ba4..8f6ca56e0ab 100644
--- a/engines/cge2/vmenu.cpp
+++ b/engines/cge2/vmenu.cpp
@@ -155,7 +155,8 @@ void VMenu::touch(uint16 mask, V2D pos, Common::KeyCode keyCode) {
 
 		Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
 		if (_lastN != n) {
-			ttsMan->say(_menu[n]->_text, Common::TextToSpeechManager::INTERRUPT);
+			if (ttsMan != nullptr)
+				ttsMan->say(_menu[n]->_text, Common::TextToSpeechManager::INTERRUPT);
 			_lastN = n;
 		}
 


Commit: 7d4ca02f597b60b6af2c0b50fd49850383982455
    https://github.com/scummvm/scummvm/commit/7d4ca02f597b60b6af2c0b50fd49850383982455
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-07-09T08:02:47+02:00

Commit Message:
CGE2: Sfinx: Do not ignore TTS settings in exit dialog

Make sure TTS only plays in the exit dialog when enabled in the game
options ("Enable Text to Speech for Objects and Options").

Note that the game already checks the settings and enables/disables
TTS via Common::TextToSpeechManager::enable (cge2.cpp:188), but
this only works on Windows
(See commit eb29aea4b48781c14e6fdbe0f3415ab9de604f6d).

Changed paths:
    engines/cge2/vmenu.cpp


diff --git a/engines/cge2/vmenu.cpp b/engines/cge2/vmenu.cpp
index 8f6ca56e0ab..a557cde63b1 100644
--- a/engines/cge2/vmenu.cpp
+++ b/engines/cge2/vmenu.cpp
@@ -155,7 +155,7 @@ void VMenu::touch(uint16 mask, V2D pos, Common::KeyCode keyCode) {
 
 		Common::TextToSpeechManager *ttsMan = g_system->getTextToSpeechManager();
 		if (_lastN != n) {
-			if (ttsMan != nullptr)
+			if (ttsMan != nullptr && ConfMan.getBool("tts_enabled_objects"))
 				ttsMan->say(_menu[n]->_text, Common::TextToSpeechManager::INTERRUPT);
 			_lastN = n;
 		}