diff options
Diffstat (limited to 'engines/queen/queen.cpp')
| -rw-r--r-- | engines/queen/queen.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index c95e44b477..65c6e9e161 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -180,6 +180,10 @@ void QueenEngine::checkOptionSettings() { } } +void QueenEngine::syncSoundSettings() { + readOptionSettings(); +} + void QueenEngine::readOptionSettings() { _sound->setVolume(ConfMan.getInt("music_volume")); _sound->musicToggle(!ConfMan.getBool("music_mute")); @@ -381,8 +385,8 @@ int QueenEngine::go() { loadGameState(ConfMan.getInt("save_slot")); } _lastSaveTime = _lastUpdateTime = _system->getMillis(); - _quit = false; - while (!_quit) { + + while (!quit()) { if (_logic->newRoom() > 0) { _logic->update(); _logic->oldRoom(_logic->currentRoom()); @@ -400,7 +404,7 @@ int QueenEngine::go() { update(true); } } - return 0; + return _eventMan->shouldRTL(); } int QueenEngine::init() { @@ -428,10 +432,6 @@ int QueenEngine::init() { _logic = new LogicGame(this); } - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume); - _sound = Sound::makeSoundInstance(_mixer, this, _resource->getCompression()); _walk = new Walk(this); //_talkspeedScale = (MAX_TEXT_SPEED - MIN_TEXT_SPEED) / 255.0; |