diff options
author | Filippos Karapetis | 2012-12-03 02:10:58 +0200 |
---|---|---|
committer | Filippos Karapetis | 2012-12-03 02:11:34 +0200 |
commit | dc93093afac824dc4407ac969bb5af775b84e5b1 (patch) | |
tree | ac876f6d672e747442f4a079f68cd165124a2aef | |
parent | 90788da0fc74472593bceee4f0a1549e925c8e73 (diff) | |
download | scummvm-rg350-dc93093afac824dc4407ac969bb5af775b84e5b1.tar.gz scummvm-rg350-dc93093afac824dc4407ac969bb5af775b84e5b1.tar.bz2 scummvm-rg350-dc93093afac824dc4407ac969bb5af775b84e5b1.zip |
SCI: Fix a small glitch when loading (regression)
This is caused by commit ed6bc0a13dea0abee56182bc9ff0cd616942fd65,
and caused players to click an extra time when trying to change the
game audio options after loading a game
-rw-r--r-- | engines/sci/sci.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 2fa992e544..1f5c354d1f 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -683,8 +683,9 @@ void SciEngine::runGame() { if (DebugMan.isDebugChannelEnabled(kDebugLevelOnStartup)) _console->attach(); + _gamestate->_syncedAudioOptions = false; + do { - _gamestate->_syncedAudioOptions = false; _gamestate->_executionStackPosChanged = false; run_vm(_gamestate); exitGame(); @@ -702,6 +703,7 @@ void SciEngine::runGame() { if (_gfxMenu) _gfxMenu->reset(); _gamestate->abortScriptProcessing = kAbortNone; + _gamestate->_syncedAudioOptions = false; } else if (_gamestate->abortScriptProcessing == kAbortLoadGame) { _gamestate->abortScriptProcessing = kAbortNone; _gamestate->_executionStack.clear(); @@ -713,6 +715,7 @@ void SciEngine::runGame() { syncSoundSettings(); syncIngameAudioOptions(); + // Games do not set their audio settings when loading } else { break; // exit loop } |