diff options
| author | Paul Gilbert | 2017-01-29 19:27:11 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-29 19:27:11 -0500 |
| commit | 6af5b08014e6573ccb9735ce3e4e2da2c141c857 (patch) | |
| tree | 41b05ce04050dae74ad8d53ac3ab0b7ef0127c6a /engines/titanic/sound/music_room.cpp | |
| parent | 5095f4c00d1b5ffd1dab06f20332500cafc84e74 (diff) | |
| download | scummvm-rg350-6af5b08014e6573ccb9735ce3e4e2da2c141c857.tar.gz scummvm-rg350-6af5b08014e6573ccb9735ce3e4e2da2c141c857.tar.bz2 scummvm-rg350-6af5b08014e6573ccb9735ce3e4e2da2c141c857.zip | |
TITANIC: Fix all music instrument properties that are bool
Diffstat (limited to 'engines/titanic/sound/music_room.cpp')
| -rw-r--r-- | engines/titanic/sound/music_room.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/engines/titanic/sound/music_room.cpp b/engines/titanic/sound/music_room.cpp index b682f00c76..9db8900d54 100644 --- a/engines/titanic/sound/music_room.cpp +++ b/engines/titanic/sound/music_room.cpp @@ -32,7 +32,6 @@ CMusicRoomHandler *CMusicRoom::_musicHandler; CMusicRoom::CMusicRoom(CGameManager *gameManager) : _gameManager(gameManager) { _sound = &_gameManager->_sound; - _controls.resize(4); } CMusicRoom::~CMusicRoom() { @@ -65,25 +64,25 @@ void CMusicRoom::setupMusic(int volume) { _musicHandler->setPitchControl2(PIANO, 0); _musicHandler->setPitchControl2(BELLS, 1); - _musicHandler->setInversionControl2(BELLS, 1); - _musicHandler->setInversionControl2(SNAKE, 0); - _musicHandler->setInversionControl2(PIANO, 1); - _musicHandler->setInversionControl2(BASS, 0); + _musicHandler->setInversionControl2(BELLS, true); + _musicHandler->setInversionControl2(SNAKE, false); + _musicHandler->setInversionControl2(PIANO, true); + _musicHandler->setInversionControl2(BASS, false); - _musicHandler->setDirectionControl2(BELLS, 0); - _musicHandler->setDirectionControl2(SNAKE, 0); - _musicHandler->setDirectionControl2(PIANO, 1); - _musicHandler->setDirectionControl2(BASS, 1); + _musicHandler->setDirectionControl2(BELLS, false); + _musicHandler->setDirectionControl2(SNAKE, false); + _musicHandler->setDirectionControl2(PIANO, true); + _musicHandler->setDirectionControl2(BASS, true); // 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); - _musicHandler->setDirectionControl(idx, controls._directionControl); - _musicHandler->setInversionControl(idx, controls._inversionControl); - _musicHandler->setMuteControl(idx, controls._muteControl); + MusicRoomInstrument &instr = _instruments[idx]; + _musicHandler->setSpeedControl(idx, instr._speedControl); + _musicHandler->setPitchControl(idx, instr._pitchControl); + _musicHandler->setDirectionControl(idx, instr._directionControl); + _musicHandler->setInversionControl(idx, instr._inversionControl); + _musicHandler->setMuteControl(idx, instr._muteControl); } _musicHandler->createWaveFile(volume); |