diff options
| author | Torbjörn Andersson | 2009-10-20 20:15:13 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2009-10-20 20:15:13 +0000 |
| commit | 42af771de001b3006ff5885033ae17c22923b4d6 (patch) | |
| tree | ca299ab202fd429c2a2ccd9f0fce9a7f8d6f27bf /engines/sword1/control.cpp | |
| parent | 9e864ff95b81e49317dde30635b16b3ef477e6b1 (diff) | |
| download | scummvm-rg350-42af771de001b3006ff5885033ae17c22923b4d6.tar.gz scummvm-rg350-42af771de001b3006ff5885033ae17c22923b4d6.tar.bz2 scummvm-rg350-42af771de001b3006ff5885033ae17c22923b4d6.zip | |
Fixed regression introduced when adding support for looping background sounds.
A.k.a. "I played through the whole game looking for regressions, and missed the
one at the intro cutscene?!"
svn-id: r45290
Diffstat (limited to 'engines/sword1/control.cpp')
| -rw-r--r-- | engines/sword1/control.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 31db54c4c8..2b6509163e 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -414,10 +414,9 @@ uint8 Control::runPanel(void) { _system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480); free(_screenBuf); _mouse->controlPanel(false); - if (retVal == CONTROL_NOTHING_DONE) { - _music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1); - _sound->newScreen(Logic::_scriptVars[SCREEN]); - } + // Can also be used to end the control panel music. + _music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1); + _sound->newScreen(Logic::_scriptVars[SCREEN]); _panelShown = false; return retVal; } |