diff options
| author | uruk | 2014-07-24 18:11:10 +0200 |
|---|---|---|
| committer | uruk | 2014-07-24 18:11:10 +0200 |
| commit | 24cc8a8762ded511e8f69ee2790f38b913ddcae9 (patch) | |
| tree | 2ce302ddaa9d5d421334310a3adda7c57fb98a3a /engines/cge2/cge2.cpp | |
| parent | 755fedcceba70267ea41ea5fed5a4e021c05b0e7 (diff) | |
| download | scummvm-rg350-24cc8a8762ded511e8f69ee2790f38b913ddcae9.tar.gz scummvm-rg350-24cc8a8762ded511e8f69ee2790f38b913ddcae9.tar.bz2 scummvm-rg350-24cc8a8762ded511e8f69ee2790f38b913ddcae9.zip | |
CGE2: Implement checkSaySwitch() and add/fix connected code.
Diffstat (limited to 'engines/cge2/cge2.cpp')
| -rw-r--r-- | engines/cge2/cge2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp index 94b876c724..5a5e3451aa 100644 --- a/engines/cge2/cge2.cpp +++ b/engines/cge2/cge2.cpp @@ -74,7 +74,7 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _quitFlag = false; _bitmapPalette = nullptr; _music = true; - _oldMusicVolume = ConfMan.getInt("music_volume");; + _oldMusicVolume = ConfMan.getInt("music_volume"); _startupMode = 1; _now = 1; _sex = 1; @@ -94,7 +94,7 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _enaVox = true; _sayCap = true; _sayVox = true; - _oldSayVox = false; + _oldSpeechVolume = ConfMan.getInt("speech_volume"); _req = 1; _midiNotify = nullptr; _spriteNotify = nullptr; @@ -167,6 +167,7 @@ bool CGE2Engine::hasFeature(EngineFeature f) const { Common::Error CGE2Engine::run() { syncSoundSettings(); + syncSpeechSettings(); initGraphics(kScrWidth, kScrHeight, false); init(); @@ -177,11 +178,10 @@ Common::Error CGE2Engine::run() { return Common::kNoError; } -void CGE2Engine::syncSoundSettings() { - Engine::syncSoundSettings(); - +void CGE2Engine::syncSpeechSettings() { _enaCap = _sayCap = ConfMan.getBool("subtitles"); _enaVox = _sayVox = !ConfMan.getBool("speech_mute"); } + } // End of namespace CGE2 |