[Scummvm-git-logs] scummvm master -> 551e336155131ba941b6d5b700a6d59cbe1cbd6c

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
551e336155 TITANIC: Fix setup & loading of music room sounds


Commit: 551e336155131ba941b6d5b700a6d59cbe1cbd6c
    https://github.com/scummvm/scummvm/commit/551e336155131ba941b6d5b700a6d59cbe1cbd6c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-05T20:38:54-05:00

Commit Message:
TITANIC: Fix setup & loading of music room sounds

Changed paths:
    engines/titanic/sound/music_room_handler.cpp
    engines/titanic/sound/music_wave.cpp


diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp
index c7f3040..d4ae89f 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 0cbd5d1..ecf2382 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;
 	}