diff options
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/engine/features.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp index a284c319c0..cad95b1c18 100644 --- a/engines/sci/engine/features.cpp +++ b/engines/sci/engine/features.cpp @@ -43,7 +43,7 @@ GameFeatures::GameFeatures(SegManager *segMan, Kernel *kernel) : _segMan(segMan) _sci2StringFunctionType = kSci2StringFunctionUninitialized; #endif _usesCdTrack = Common::File::exists("cdaudio.map"); - if (ConfMan.hasKey("use_cdaudio") && !ConfMan.getBool("use_cdaudio")) + if (!ConfMan.getBool("use_cdaudio")) _usesCdTrack = false; } diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index c77b49400f..9b0ee6924b 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -221,8 +221,7 @@ Common::Error SciEngine::run() { // Initialize the game screen _gfxScreen = new GfxScreen(_resMan); - bool enableUnDitheringFlag = ConfMan.hasKey("disable_dithering") && ConfMan.getBool("disable_dithering"); - _gfxScreen->enableUndithering(enableUnDitheringFlag); + _gfxScreen->enableUndithering(ConfMan.getBool("disable_dithering")); _kernel = new Kernel(_resMan, segMan); diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 8481f10171..05bb90332a 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -44,10 +44,7 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM // resource number, but it's totally unrelated to the menu music). // The GK1 demo (very late SCI1.1) does the same thing // TODO: Check the QFG4 demo - - // If the prefer_digitalsfx key is missing, default to enable digital SFX - bool preferDigitalSfx = !ConfMan.hasKey("prefer_digitalsfx") || ConfMan.getBool("prefer_digitalsfx"); - _useDigitalSFX = (getSciVersion() >= SCI_VERSION_2 || g_sci->getGameId() == GID_GK1 || preferDigitalSfx); + _useDigitalSFX = (getSciVersion() >= SCI_VERSION_2 || g_sci->getGameId() == GID_GK1 || ConfMan.getBool("prefer_digitalsfx")); _music = new SciMusic(_soundVersion, _useDigitalSFX); _music->init(); |