diff options
| author | Paul Gilbert | 2017-01-29 15:37:00 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-29 15:37:00 -0500 |
| commit | a9abeb5f95fa535df08728bc8563675efd007f03 (patch) | |
| tree | 6cc8e0b0abac3819e15f6541465ea24d1095b5f4 /engines/titanic/game | |
| parent | dc640ab50a63b0383c6aec6df4e0427df1824c3e (diff) | |
| download | scummvm-rg350-a9abeb5f95fa535df08728bc8563675efd007f03.tar.gz scummvm-rg350-a9abeb5f95fa535df08728bc8563675efd007f03.tar.bz2 scummvm-rg350-a9abeb5f95fa535df08728bc8563675efd007f03.zip | |
TITANIC: Cleanup of music room setup code
Diffstat (limited to 'engines/titanic/game')
| -rw-r--r-- | engines/titanic/game/music_console_button.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/game/play_music_button.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/game/music_console_button.cpp b/engines/titanic/game/music_console_button.cpp index 40492aafe4..7a1aed0067 100644 --- a/engines/titanic/game/music_console_button.cpp +++ b/engines/titanic/game/music_console_button.cpp @@ -57,9 +57,9 @@ bool CMusicConsoleButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { CMusicHasStartedMsg startedMsg; startedMsg.execute("Music Room Phonograph"); - if (CMusicRoom::_musicHandler->checkSound(1) - && CMusicRoom::_musicHandler->checkSound(2) - && CMusicRoom::_musicHandler->checkSound(3)) { + if (CMusicRoom::_musicHandler->checkInstrument(SNAKE) + && CMusicRoom::_musicHandler->checkInstrument(PIANO) + && CMusicRoom::_musicHandler->checkInstrument(BASS)) { CCorrectMusicPlayedMsg correctMsg; correctMsg.execute(findRoom()); } diff --git a/engines/titanic/game/play_music_button.cpp b/engines/titanic/game/play_music_button.cpp index 21fd3c336a..604938fa23 100644 --- a/engines/titanic/game/play_music_button.cpp +++ b/engines/titanic/game/play_music_button.cpp @@ -54,7 +54,7 @@ bool CPlayMusicButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { loadFrame(0); _flag = false; } else { - musicRoom->startMusic(100); + musicRoom->setupMusic(100); playMovie(MOVIE_REPEAT); _ticks = getTicksCount(); _flag = true; |