aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorJonathan Gray2003-07-10 10:36:24 +0000
committerJonathan Gray2003-07-10 10:36:24 +0000
commit71ca768c675ec1dc1700e5709bf5b7b55619023e (patch)
tree1de8448bafd55f4dbcc55b397734e69353bf0763 /sky
parent6480a00855d88615ab8f19798d82dc93bdce46ae (diff)
downloadscummvm-rg350-71ca768c675ec1dc1700e5709bf5b7b55619023e.tar.gz
scummvm-rg350-71ca768c675ec1dc1700e5709bf5b7b55619023e.tar.bz2
scummvm-rg350-71ca768c675ec1dc1700e5709bf5b7b55619023e.zip
abide by command line request for no subtitles if running the cd version
svn-id: r8898
Diffstat (limited to 'sky')
-rw-r--r--sky/sky.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 6bc10f5820..7c14ea35c7 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -223,9 +223,12 @@ void SkyState::initialise(void) {
_system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
}
- if (isCDVersion())
- _systemVars.systemFlags |= SF_ALLOW_SPEECH | SF_ALLOW_TEXT;
- else
+ if (isCDVersion()) {
+ if (_detector->_noSubtitles)
+ _systemVars.systemFlags |= SF_ALLOW_SPEECH;
+ else
+ _systemVars.systemFlags |= SF_ALLOW_SPEECH | SF_ALLOW_TEXT;
+ } else
_systemVars.systemFlags |= SF_ALLOW_TEXT;
_systemVars.systemFlags |= SF_PLAY_VOCS;