[Scummvm-git-logs] scummvm master -> 8dd19ae10f31cbabe1286640cf93b90480c41430

[AndywinXp]

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:
7c158b1005 SCUMM: GUI: Fix voice mode string id for foreign versions of FT
8dd19ae10f SCUMM: DIG (demo): Fix voice mode behavior


Commit: 7c158b10050fbb6d5c2d107ab8c95fa7f5fdc0cb
    https://github.com/scummvm/scummvm/commit/7c158b10050fbb6d5c2d107ab8c95fa7f5fdc0cb
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-08T23:26:27+01:00

Commit Message:
SCUMM: GUI: Fix voice mode string id for foreign versions of FT

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 9c03e9ad91b..d2be33059e9 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -1170,13 +1170,24 @@ const char *ScummEngine_v7::getGUIString(int stringId) {
 		resStringId = 49;
 		break;
 	case gsVoiceOnly:
-		resStringId = 50;
+		if (_game.id == GID_FT &&
+			(_language != Common::EN_ANY && _language != Common::RU_RUS)) {
+			resStringId = 52;
+		} else {
+			resStringId = 50;
+		}
+
 		break;
 	case gsVoiceAndText:
 		resStringId = 51;
 		break;
 	case gsTextDisplayOnly:
-		resStringId = 52;
+		if (_game.id == GID_FT &&
+			(_language != Common::EN_ANY && _language != Common::RU_RUS)) {
+			resStringId = 50;
+		} else {
+			resStringId = 52;
+		}
 		break;
 	case gsTextSpeedSlider:
 		resStringId = 53;


Commit: 8dd19ae10f31cbabe1286640cf93b90480c41430
    https://github.com/scummvm/scummvm/commit/8dd19ae10f31cbabe1286640cf93b90480c41430
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-08T23:26:47+01:00

Commit Message:
SCUMM: DIG (demo): Fix voice mode behavior

Changed paths:
    engines/scumm/sound.cpp


diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 02e5392831f..f6acaf2affc 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -733,7 +733,8 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
 			resetSpeechTimer();
 
 		return;
-	} else if (_vm->_game.id == GID_DIG && (_vm->_game.features & GF_DEMO)) {
+	} else if (_vm->_game.id == GID_DIG && (_vm->_game.features & GF_DEMO) &&
+			   _vm->_voiceMode != 2) {
 		_sfxMode |= mode;
 
 		char filename[30];