[Scummvm-git-logs] scummvm master -> 2349f915424c48dc001ec8840d7df371fa836c6d

[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:
2349f91542 TITANIC: Implemented CMusicWave stop method


Commit: 2349f915424c48dc001ec8840d7df371fa836c6d
    https://github.com/scummvm/scummvm/commit/2349f915424c48dc001ec8840d7df371fa836c6d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-29T22:43:49-05:00

Commit Message:
TITANIC: Implemented CMusicWave stop method

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


diff --git a/engines/titanic/sound/music_wave.cpp b/engines/titanic/sound/music_wave.cpp
index 6cfab5a..835f4bc 100644
--- a/engines/titanic/sound/music_wave.cpp
+++ b/engines/titanic/sound/music_wave.cpp
@@ -80,7 +80,23 @@ CWaveFile *CMusicWave::createWaveFile(const CString &name) {
 }
 
 void CMusicWave::stop() {
-	// TODO
+	if (_gameObjects[0]) {
+		switch (_instrument) {
+		case MV_PIANO:
+			_gameObjects[1]->setVisible(false);
+			_gameObjects[2]->setVisible(false);
+			_gameObjects[3]->setVisible(false);
+			_gameObjects[0]->playMovie(29, 58, MOVIE_STOP_PREVIOUS);
+			break;
+
+		case MV_BELLS:
+			_gameObjects[0]->stopMovie();
+			break;
+
+		default:
+			break;
+		}
+	}
 }
 
 void CMusicWave::trigger() {