diff options
| author | Paul Gilbert | 2017-02-05 20:38:54 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-05 20:38:54 -0500 |
| commit | 551e336155131ba941b6d5b700a6d59cbe1cbd6c (patch) | |
| tree | 878d10db0df5eed827e5a0d7bfa329caa2c9dde5 /engines/titanic/sound | |
| parent | 3642054399272a9a038fd166ae0baedf48de0110 (diff) | |
| download | scummvm-rg350-551e336155131ba941b6d5b700a6d59cbe1cbd6c.tar.gz scummvm-rg350-551e336155131ba941b6d5b700a6d59cbe1cbd6c.tar.bz2 scummvm-rg350-551e336155131ba941b6d5b700a6d59cbe1cbd6c.zip | |
TITANIC: Fix setup & loading of music room sounds
Diffstat (limited to 'engines/titanic/sound')
| -rw-r--r-- | engines/titanic/sound/music_room_handler.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/sound/music_wave.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp index c7f3040d20..d4ae89fa67 100644 --- a/engines/titanic/sound/music_room_handler.cpp +++ b/engines/titanic/sound/music_room_handler.cpp @@ -69,7 +69,7 @@ CMusicWave *CMusicRoomHandler::createMusicWave(MusicInstrument instrument, int c return nullptr; } - _musicWaves[instrument]->setSize(count); + _musicWaves[instrument]->setFilesCount(count); return _musicWaves[instrument]; } diff --git a/engines/titanic/sound/music_wave.cpp b/engines/titanic/sound/music_wave.cpp index 0cbd5d1b98..ecf23824b6 100644 --- a/engines/titanic/sound/music_wave.cpp +++ b/engines/titanic/sound/music_wave.cpp @@ -50,7 +50,7 @@ void CMusicWave::deinit() { } CMusicWave::CMusicWave(CProjectItem *project, CSoundManager *soundManager, MusicWaveInstrument instrument) : - _soundManager(soundManager), _instrument(instrument) { + _project(project), _soundManager(soundManager), _instrument(instrument) { Common::fill(&_gameObjects[0], &_gameObjects[4], (CGameObject *)nullptr); _floatVal = 0.0; _field34 = -1; @@ -79,9 +79,9 @@ CMusicWave::CMusicWave(CProjectItem *project, CSoundManager *soundManager, Music break; case MV_SNAKE: - _gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Snake Hammer")); - _gameObjects[1] = static_cast<CGameObject *>(_project->findByName("Snake Glass")); - _gameObjects[2] = static_cast<CGameObject *>(_project->findByName("Snake Head")); + _gameObjects[0] = static_cast<CGameObject *>(_project->findByName("Snake_Hammer")); + _gameObjects[1] = static_cast<CGameObject *>(_project->findByName("Snake_Glass")); + _gameObjects[2] = static_cast<CGameObject *>(_project->findByName("Snake_Head")); _floatVal = 0.17; break; } |