aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/carry
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-30 22:51:18 -0400
committerPaul Gilbert2016-08-30 22:51:18 -0400
commitd9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740 (patch)
treee2fe667c916ffa65be6a9023bc3be5b3c05652c9 /engines/titanic/carry
parent46316fdb63c5ce945fbad3434d9078628014097a (diff)
downloadscummvm-rg350-d9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740.tar.gz
scummvm-rg350-d9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740.tar.bz2
scummvm-rg350-d9fb4a2bc5ed99bc46e4d9ced3ef4bafa5dc5740.zip
TITANIC: Fleshed out CMusicRoom & CMusicHandler setup
Diffstat (limited to 'engines/titanic/carry')
-rw-r--r--engines/titanic/carry/phonograph_cylinder.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/engines/titanic/carry/phonograph_cylinder.cpp b/engines/titanic/carry/phonograph_cylinder.cpp
index 41df050d2b..de0ed0a67c 100644
--- a/engines/titanic/carry/phonograph_cylinder.cpp
+++ b/engines/titanic/carry/phonograph_cylinder.cpp
@@ -167,29 +167,29 @@ bool CPhonographCylinder::SetMusicControlsMsg(CSetMusicControlsMsg *msg) {
return true;
CMusicRoom *musicRoom = getMusicRoom();
- musicRoom->setItem5(BELLS, _bellsMuteControl);
- musicRoom->setItem2(BELLS, _bellsPitchControl);
- musicRoom->setItem1(BELLS, _bellsSpeedControl);
- musicRoom->setItem4(BELLS, _bellsInversionControl);
- musicRoom->setItem3(BELLS, _bellsDirectionControl);
-
- musicRoom->setItem5(SNAKE, _snakeMuteControl);
- musicRoom->setItem2(SNAKE, _snakePitchControl);
- musicRoom->setItem1(SNAKE, _snakeSpeedControl);
- musicRoom->setItem4(SNAKE, _snakeInversionControl);
- musicRoom->setItem3(SNAKE, _snakeDirectionControl);
-
- musicRoom->setItem5(PIANO, _pianoMuteControl);
- musicRoom->setItem2(PIANO, _pianoPitchControl);
- musicRoom->setItem1(PIANO, _pianoSpeedControl);
- musicRoom->setItem4(PIANO, _pianoInversionControl);
- musicRoom->setItem3(PIANO, _pianoDirectionControl);
-
- musicRoom->setItem5(BASS, _bassMuteControl);
- musicRoom->setItem2(BASS, _bassPitchControl);
- musicRoom->setItem1(BASS, _bassSpeedControl);
- musicRoom->setItem4(BASS, _bassInversionControl);
- musicRoom->setItem3(BASS, _bassDirectionControl);
+ musicRoom->setMuteControl(BELLS, _bellsMuteControl);
+ musicRoom->setPitchControl(BELLS, _bellsPitchControl);
+ musicRoom->setSpeedControl(BELLS, _bellsSpeedControl);
+ musicRoom->setInversionControl(BELLS, _bellsInversionControl);
+ musicRoom->setDirectionControl(BELLS, _bellsDirectionControl);
+
+ musicRoom->setMuteControl(SNAKE, _snakeMuteControl);
+ musicRoom->setPitchControl(SNAKE, _snakePitchControl);
+ musicRoom->setSpeedControl(SNAKE, _snakeSpeedControl);
+ musicRoom->setInversionControl(SNAKE, _snakeInversionControl);
+ musicRoom->setDirectionControl(SNAKE, _snakeDirectionControl);
+
+ musicRoom->setMuteControl(PIANO, _pianoMuteControl);
+ musicRoom->setPitchControl(PIANO, _pianoPitchControl);
+ musicRoom->setSpeedControl(PIANO, _pianoSpeedControl);
+ musicRoom->setInversionControl(PIANO, _pianoInversionControl);
+ musicRoom->setDirectionControl(PIANO, _pianoDirectionControl);
+
+ musicRoom->setMuteControl(BASS, _bassMuteControl);
+ musicRoom->setPitchControl(BASS, _bassPitchControl);
+ musicRoom->setSpeedControl(BASS, _bassSpeedControl);
+ musicRoom->setInversionControl(BASS, _bassInversionControl);
+ musicRoom->setDirectionControl(BASS, _bassDirectionControl);
return true;
}