[Scummvm-git-logs] scummvm master -> 39abef4009ffc39dbdab75ee0af6bb35009bdde1
bluegr
noreply at scummvm.org
Tue Nov 10 07:28:15 UTC 2026
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:
39abef4009 GOB: Expose the subtitle setting for Woodruff
Commit: 39abef4009ffc39dbdab75ee0af6bb35009bdde1
https://github.com/scummvm/scummvm/commit/39abef4009ffc39dbdab75ee0af6bb35009bdde1
Author: Michael Ostermann (Michael.Ostermann at its4bm.com)
Date: 2026-11-10T09:28:09+02:00
Commit Message:
GOB: Expose the subtitle setting for Woodruff
Woodruff has a complete subtitle path: the VMD subtitle parts are drawn
through Draw::printTotText once Global::_doSubtitles is set, which
Init_v4 reads from ConfMan "subtitles". There was no way to set it:
- GobEngine::hasFeature did not report kSupportsSubtitleOptions, so the
in-game options dialog never built the subtitle controls.
- Every Woodruff entry was tagged GUIO_NOSPEECH, which also disables the
subtitle controls. The speech is real, embedded in the VMDs and mixed
as SFX, so GUIO_NOSPEECHVOLUME describes it.
The feature is reported for Woodruff only, the one game type whose init
reads the setting. The Non-Interactive Demo keeps GUIO_NOSUBTITLES.
Changed paths:
engines/gob/detection/tables_woodruff.h
engines/gob/metaengine.cpp
diff --git a/engines/gob/detection/tables_woodruff.h b/engines/gob/detection/tables_woodruff.h
index e99d0aa784d..d803b5d54d6 100644
--- a/engines/gob/detection/tables_woodruff.h
+++ b/engines/gob/detection/tables_woodruff.h
@@ -40,7 +40,7 @@
EN_GRB,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -53,7 +53,7 @@
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -66,7 +66,7 @@
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -79,7 +79,7 @@
IT_ITA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -92,7 +92,7 @@
ES_ESP,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -105,7 +105,7 @@
RU_RUS,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -118,7 +118,7 @@
EN_GRB,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -131,7 +131,7 @@
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -144,7 +144,7 @@
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -157,7 +157,7 @@
IT_ITA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -170,7 +170,7 @@
ES_ESP,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -183,7 +183,7 @@
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -196,7 +196,7 @@
ES_ESP,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -209,7 +209,7 @@
EN_GRB,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -222,7 +222,7 @@
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -235,7 +235,7 @@
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -248,7 +248,7 @@
IT_ITA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -261,7 +261,7 @@
EN_GRB,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -274,7 +274,7 @@
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -287,7 +287,7 @@
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -300,7 +300,7 @@
IT_ITA,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -313,7 +313,7 @@
ES_ESP,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -326,7 +326,7 @@
PL_POL,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
@@ -339,7 +339,7 @@
RU_RUS,
kPlatformWindows,
ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSPEECH, GUIO_NOASPECT)
+ GUIO2(GUIO_NOSPEECHVOLUME, GUIO_NOASPECT)
},
kFeatures640x480,
0, 0, 0
diff --git a/engines/gob/metaengine.cpp b/engines/gob/metaengine.cpp
index 2d6c8b5844c..faba55ff0c1 100644
--- a/engines/gob/metaengine.cpp
+++ b/engines/gob/metaengine.cpp
@@ -87,8 +87,10 @@ bool GobMetaEngine::hasFeature(MetaEngineFeature f) const {
}
bool Gob::GobEngine::hasFeature(EngineFeature f) const {
+ // Only Woodruff reads the subtitles setting (Init_v4::updateConfig)
return
- (f == kSupportsReturnToLauncher);
+ (f == kSupportsReturnToLauncher) ||
+ (f == kSupportsSubtitleOptions && _gameType == kGameTypeWoodruff);
}
Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const Gob::GOBGameDescription *gd) const {
More information about the Scummvm-git-logs
mailing list