[Scummvm-git-logs] scummvm master -> 513d7bdcd7a9e0b0c824e76d299e0d0ac96f4355
criezy
noreply at scummvm.org
Sun Oct 6 20:49:29 UTC 2024
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:
2b22ebcd34 AGS: Add detection for several versions of Wadjet Eye GOG Mac games
513d7bdcd7 MORTEVIELLE: Add engine option to disable TTS
Commit: 2b22ebcd3473044c73e2f4a30bbe62ce463e2473
https://github.com/scummvm/scummvm/commit/2b22ebcd3473044c73e2f4a30bbe62ce463e2473
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2024-10-06T21:49:18+01:00
Commit Message:
AGS: Add detection for several versions of Wadjet Eye GOG Mac games
Changed paths:
engines/ags/detection_tables.h
diff --git a/engines/ags/detection_tables.h b/engines/ags/detection_tables.h
index c726254226a..8494be705c8 100644
--- a/engines/ags/detection_tables.h
+++ b/engines/ags/detection_tables.h
@@ -4386,6 +4386,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("blackwell4", "ac2game.dat", "3c999468155295d3e0809c04b2e53cff", 216579565, 0), // Mac v3.0
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("blackwell4", "ac2game.dat", "e08b56307a597c1384e45b7e6e25d14c", 216582921, 0), // Mac v3.1a
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("blackwell4", "ac2game.dat", "ff5e37e618eb9ed86c4a40de806e9a4a", 216583146, 0), // Mac v3.2
+ GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("blackwell4", "ac2game.dat", "836738be511b4854c2e22b8519aa27fa", 216583236, 0), // Mac v3.4
GAME_ENTRY_PLUGIN_STEAM_EN_NOAUTOSAVE("blackwell4", "deception.exe", "b3b192cf20a2f7666ddea3410dbd87cc", 304076138, GAMEFLAG_PLUGINS_AGSTEAM_WADJETEYE),
GAME_ENTRY_PLUGIN_STEAM_EN_NOAUTOSAVE("blackwell4", "deception.exe", "499c3261a1f73c5b78125beeca1c2d08", 305215631, GAMEFLAG_PLUGINS_AGSTEAM_WADJETEYE),
GAME_ENTRY_PLUGIN_STEAM_EN_NOAUTOSAVE("blackwell4", "deception.exe", "8f7335b030b38b610637b3033859f828", 305293936, GAMEFLAG_PLUGINS_AGSTEAM_WADJETEYE),
@@ -4497,6 +4498,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "ac2game.dat", "056239de34dfa52cfe1b645eee4eacb7", 70412031, 0), // Mac v2.3
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "ac2game.dat", "ab6c0c2d89adb2d529131190a657be6a", 58212622, 0), // Mac v3.0
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "ac2game.dat", "ab6c0c2d89adb2d529131190a657be6a", 58249454, 0), // Mac v3.0.1
+ GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "ac2game.dat", "ab6c0c2d89adb2d529131190a657be6a", 58283570, 0), // Mac v3.3
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "agsgame.dat", "f3c0c7d3892bdd8963e8ce017f73de08", 62069353, 0), // Linux
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "Gemini Rue.ags", "ab6c0c2d89adb2d529131190a657be6a", 58212622, 0), // Linux v3.0
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("geminirue", "Gemini Rue.ags", "ab6c0c2d89adb2d529131190a657be6a", 58249454, 0), // Linux v3.0.1
@@ -4657,6 +4659,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("primordia", "ac2game.dat", "fe4f46407ac736cf0e6badf96cef4ee5", 977991488, 0), // Mac v3.0a
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("primordia", "ac2game.dat", "fe4f46407ac736cf0e6badf96cef4ee5", 866341456, 0), // Mac v3.5a
GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("primordia", "ac2game.dat", "fe4f46407ac736cf0e6badf96cef4ee5", 866342835, 0), // Mac v3.9
+ GAME_ENTRY_PLUGIN_GOG_NOAUTOSAVE("primordia", "ac2game.dat", "fe4f46407ac736cf0e6badf96cef4ee5", 866348102, 0), // Mac v4.0, v4.1
GAME_ENTRY_PLUGIN_STEAM_NOAUTOSAVE("primordia", "primordia.exe", "f2edc9c3161f1f538df9b4c59fc89e24", 978377182, 0),
GAME_ENTRY_PLUGIN_STEAM_NOAUTOSAVE("primordia", "primordia.exe", "8f717a5a14ceda815292ce4065348afb", 979602678, 0), // with Ita translation
GAME_ENTRY_PLUGIN_STEAM_NOAUTOSAVE("primordia", "primordia.exe", "8f717a5a14ceda815292ce4065348afb", 979603766, 0),
@@ -4837,6 +4840,7 @@ const AGSGameDescription GAME_DESCRIPTIONS[] = {
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("technobabylon", "ac2game.dat", "570e69be27d3fa94b50f2779100e3fed", 445711980, 0), // Mac v2.5a
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("technobabylon", "ac2game.dat", "9d48667020cf3e3612a753934b16cc04", 416922956, 0), // Mac v3.0
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("technobabylon", "ac2game.dat", "9d48667020cf3e3612a753934b16cc04", 416929711, 0), // Mac v3.0.1
+ GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("technobabylon", "ac2game.dat", "9d48667020cf3e3612a753934b16cc04", 416930653, 0), // Mac v3.1
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("technobabylon", "technobabylon.ags", "9d48667020cf3e3612a753934b16cc04", 416929711, 0), // Linux v3.0.1
GAME_ENTRY_PLUGIN_GOG_EN_NOAUTOSAVE("technobabylon", "technobabylon.ags", "9d48667020cf3e3612a753934b16cc04", 416930653, 0), // Linux v3.0.5
GAME_ENTRY_EN("technobabylon", "technobabylon.exe", "e523535e730f313e1ed9b19b1a9dd228", 447894701), // Humble Bundle
Commit: 513d7bdcd7a9e0b0c824e76d299e0d0ac96f4355
https://github.com/scummvm/scummvm/commit/513d7bdcd7a9e0b0c824e76d299e0d0ac96f4355
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2024-10-06T21:49:18+01:00
Commit Message:
MORTEVIELLE: Add engine option to disable TTS
Changed paths:
engines/mortevielle/POTFILES
engines/mortevielle/detection.h
engines/mortevielle/detection_tables.h
engines/mortevielle/metaengine.cpp
engines/mortevielle/sound.cpp
diff --git a/engines/mortevielle/POTFILES b/engines/mortevielle/POTFILES
index ee7ef3ed693..5c174a1a62b 100644
--- a/engines/mortevielle/POTFILES
+++ b/engines/mortevielle/POTFILES
@@ -1 +1,2 @@
engines/mortevielle/mortevielle.cpp
+engines/mortevielle/metaengine.cpp
diff --git a/engines/mortevielle/detection.h b/engines/mortevielle/detection.h
index acad8e9e6a4..a2a69ccab1f 100644
--- a/engines/mortevielle/detection.h
+++ b/engines/mortevielle/detection.h
@@ -26,6 +26,8 @@
namespace Mortevielle {
+#define GAMEOPTION_TTS GUIO_GAMEOPTIONS1
+
enum {
kUseOriginalData = 0,
kUseEngineDataFile = 1
diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index 0629d7f8d46..3dde770b0a4 100644
--- a/engines/mortevielle/detection_tables.h
+++ b/engines/mortevielle/detection_tables.h
@@ -32,7 +32,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO1(GUIO_NOMIDI)
+ GUIO2(GUIO_NOMIDI, GAMEOPTION_TTS)
}, Common::FR_FRA, kUseOriginalData
},
// German
@@ -45,7 +45,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO1(GUIO_NOMIDI)
+ GUIO2(GUIO_NOMIDI, GAMEOPTION_TTS)
}, Common::DE_DEU, kUseOriginalData
},
@@ -59,7 +59,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
// Common::DE_DEU,
// Common::kPlatformDOS,
// ADGF_NO_FLAGS,
-// GUIO1(GUIO_NOMIDI)
+// GUIO2(GUIO_NOMIDI, GAMEOPTION_TTS)
// }, Common::DE_DEU, kUseEngineDataFile
// },
@@ -76,7 +76,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO1(GUIO_NOMIDI)
+ GUIO2(GUIO_NOMIDI, GAMEOPTION_TTS)
}, Common::FR_FRA, kUseEngineDataFile
},
@@ -90,7 +90,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO1(GUIO_NOMIDI)
+ GUIO2(GUIO_NOMIDI, GAMEOPTION_TTS)
}, Common::DE_DEU, kUseEngineDataFile
},
@@ -104,7 +104,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
- GUIO1(GUIO_NOMIDI)
+ GUIO2(GUIO_NOMIDI, GAMEOPTION_TTS)
}, Common::FR_FRA, kUseEngineDataFile
},
diff --git a/engines/mortevielle/metaengine.cpp b/engines/mortevielle/metaengine.cpp
index 127d4d11bd8..112673ab344 100644
--- a/engines/mortevielle/metaengine.cpp
+++ b/engines/mortevielle/metaengine.cpp
@@ -21,6 +21,7 @@
#include "base/plugins.h"
#include "engines/advancedDetector.h"
+#include "common/translation.h"
#include "mortevielle/mortevielle.h"
#include "mortevielle/saveload.h"
@@ -28,6 +29,24 @@
namespace Mortevielle {
+#ifdef USE_TTS
+static const ADExtraGuiOptionsMap optionsList[] = {
+ {
+ GAMEOPTION_TTS,
+ {
+ _s("Enable Text to Speech"),
+ _s("Use TTS to read text in the game (if TTS is available)"),
+ "tts_enabled",
+ false,
+ 0,
+ 0
+ }
+ },
+ AD_EXTRA_GUI_OPTIONS_TERMINATOR
+};
+#endif
+
+
uint32 MortevielleEngine::getGameFlags() const { return _gameDescription->desc.flags; }
Common::Language MortevielleEngine::getLanguage() const { return _gameDescription->desc.language; }
@@ -44,6 +63,12 @@ public:
return "mortevielle";
}
+#ifdef USE_TTS
+ const ADExtraGuiOptionsMap *getAdvancedExtraGuiOptions() const override {
+ return Mortevielle::optionsList;
+ }
+#endif
+
Common::Error createInstance(OSystem *syst, Engine **engine, const Mortevielle::MortevielleGameDescription *desc) const override;
bool hasFeature(MetaEngineFeature f) const override;
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 0be268b13da..b1e4c75a966 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -67,7 +67,7 @@ SoundManager::SoundManager(MortevielleEngine *vm, Audio::Mixer *mixer) {
_ttsMan = g_system->getTextToSpeechManager();
if (_ttsMan) {
_ttsMan->setLanguage(ConfMan.get("language"));
- _ttsMan->enable(true);
+ _ttsMan->enable(ConfMan.getBool("tts_enabled"));
_ttsMan->stop();
_ttsMan->setRate(0);
_ttsMan->setPitch(0);
@@ -766,7 +766,7 @@ void SoundManager::startSpeech(int rep, int character, int typ) {
// Speech
const int haut[9] = { 0, 0, 1, -3, 6, -2, 2, 7, -1 };
const int voiceIndices[9] = { 0, 1, 2, 3, 0, 4, 5, 1, 6 };
- if (!_ttsMan)
+ if (!_ttsMan || !ConfMan.getBool("tts_enabled"))
return;
Common::Array<int> voices;
int pitch = haut[character];
More information about the Scummvm-git-logs
mailing list