aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/scummvm.cpp4
-rw-r--r--sky/sky.cpp6
2 files changed, 10 insertions, 0 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 51debb0e30..be19c99993 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -626,6 +626,10 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_demoMode = ConfMan.getBool("demo_mode");
_noSubtitles = ConfMan.getBool("subtitles");
_noSubtitles ^=1;
+ if (ConfMan.hasKey("nosubtitles")) {
+ warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
+ _noSubtitles = ConfMan.getBool("nosubtitles");
+ }
_confirmExit = ConfMan.getBool("confirm_exit");
_defaultTalkDelay = ConfMan.getInt("talkspeed");
_native_mt32 = ConfMan.getBool("native_mt32");
diff --git a/sky/sky.cpp b/sky/sky.cpp
index e14d5bad82..1508a11020 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -270,6 +270,12 @@ void SkyEngine::initialise(void) {
if (isCDVersion()) {
_systemVars.systemFlags |= SF_ALLOW_SPEECH;
+ if (ConfMan.hasKey("nosubtitles")) {
+ warning("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead");
+ if (ConfMan.getBool("nosubtitles") == false)
+ _systemVars.systemFlags |= SF_ALLOW_TEXT;
+ }
+
if (ConfMan.getBool("subtitles"))
_systemVars.systemFlags |= SF_ALLOW_TEXT;
} else