diff options
| author | Paul Gilbert | 2017-01-29 18:58:36 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-29 18:58:36 -0500 |
| commit | 5095f4c00d1b5ffd1dab06f20332500cafc84e74 (patch) | |
| tree | 9eb53580015a0809d43a3f9dcafe78c940b6f124 /engines/titanic/sound/music_room.cpp | |
| parent | e7446adaf2b734350110d84eb43252639d7805e7 (diff) | |
| download | scummvm-rg350-5095f4c00d1b5ffd1dab06f20332500cafc84e74.tar.gz scummvm-rg350-5095f4c00d1b5ffd1dab06f20332500cafc84e74.tar.bz2 scummvm-rg350-5095f4c00d1b5ffd1dab06f20332500cafc84e74.zip | |
TITANIC: Cleanup of music instrument settings code
Diffstat (limited to 'engines/titanic/sound/music_room.cpp')
| -rw-r--r-- | engines/titanic/sound/music_room.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/titanic/sound/music_room.cpp b/engines/titanic/sound/music_room.cpp index 7f4ffdc228..b682f00c76 100644 --- a/engines/titanic/sound/music_room.cpp +++ b/engines/titanic/sound/music_room.cpp @@ -54,6 +54,7 @@ void CMusicRoom::destroyMusicHandler() { void CMusicRoom::setupMusic(int volume) { if (_musicHandler) { + // Set up the control values that form the correct settings _musicHandler->setSpeedControl2(BELLS, 0); _musicHandler->setSpeedControl2(SNAKE, 1); _musicHandler->setSpeedControl2(PIANO, -1); @@ -74,8 +75,9 @@ void CMusicRoom::setupMusic(int volume) { _musicHandler->setDirectionControl2(PIANO, 1); _musicHandler->setDirectionControl2(BASS, 1); - for (MusicControlArea idx = BELLS; idx <= BASS; - idx = (MusicControlArea)((int)idx + 1)) { + // Set up the current control values + for (MusicInstrument idx = BELLS; idx <= BASS; + idx = (MusicInstrument)((int)idx + 1)) { Controls &controls = _controls[idx]; _musicHandler->setSpeedControl(idx, controls._speedControl); _musicHandler->setPitchControl(idx, controls._pitchControl); |