[Scummvm-git-logs] scummvm master -> 289a9b37e9f792fb6271ad61db70b006f543fa0c

[AndywinXp]

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:
289a9b37e9 SCUMM: Attempt at fixing #14337


Commit: 289a9b37e9f792fb6271ad61db70b006f543fa0c
    https://github.com/scummvm/scummvm/commit/289a9b37e9f792fb6271ad61db70b006f543fa0c
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-03-23T16:44:01+01:00

Commit Message:
SCUMM: Attempt at fixing #14337

Bug: "Subtitles are not shown anymore in some games".
To solve this we use the "subtitles" and "speech_mute" keys as masters
and "original_gui_text_status", used to sync the original GUI as slave.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 4f84a6419c6..a0ec149c904 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2220,21 +2220,17 @@ void ScummEngine::setupMusic(int midi, const Common::String &macInstrumentFile)
 
 void ScummEngine::syncSoundSettings() {
 	if (isUsingOriginalGUI() && _game.version > 6) {
-		if (ConfMan.hasKey("original_gui_text_status", _targetName)) {
-			_voiceMode = ConfMan.getInt("original_gui_text_status");
-		} else if (ConfMan.hasKey("subtitles", _targetName) && ConfMan.hasKey("speech_mute", _targetName)){
-			int guiTextStatus = 0;
-			if (ConfMan.getBool("speech_mute")) {
-				guiTextStatus = 2;
-			} else if (ConfMan.getBool("subtitles")) {
-				guiTextStatus = 1;
-			}
-
-			// Let's set it now so we don't have to do the conversion the next time...
-			ConfMan.setInt("original_gui_text_status", guiTextStatus);
-			_voiceMode = guiTextStatus;
+		int guiTextStatus = 0;
+		if (ConfMan.getBool("speech_mute")) {
+			guiTextStatus = 2;
+		} else if (ConfMan.getBool("subtitles")) {
+			guiTextStatus = 1;
 		}
 
+		// Mainly used by COMI
+		ConfMan.setInt("original_gui_text_status", guiTextStatus);
+		_voiceMode = guiTextStatus;
+
 		if (VAR_VOICE_MODE != 0xFF)
 			VAR(VAR_VOICE_MODE) = _voiceMode;