[Scummvm-git-logs] scummvm master -> 501681dd24f211656adc66fc049e42f858b7e59e

[sev-]

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:
501681dd24 FULLPIPE: Fix music looping in scene04. This completes this scene


Commit: 501681dd24f211656adc66fc049e42f858b7e59e
    https://github.com/scummvm/scummvm/commit/501681dd24f211656adc66fc049e42f858b7e59e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-11-30T15:43:13+01:00

Commit Message:
FULLPIPE: Fix music looping in scene04. This completes this scene

Changed paths:
    engines/fullpipe/scenes/scene04.cpp


diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index b8f80e8..d349783 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -919,7 +919,7 @@ void sceneHandler04_showCoin() {
 void sceneHandler04_stopSound() {
 	g_vars->scene04_soundPlaying = false;
 
-	warning("STUB: sceneHandler04_stopSound()");
+	g_fp->stopSoundStream2();
 }
 
 void sceneHandler04_animOutOfBottle(ExCommand *ex) {
@@ -1095,8 +1095,12 @@ void updateSound() {
 		break;
 	case 2:
 		if (!g_fp->_mixer->isSoundHandleActive(*g_fp->_soundStream3)) {
-			g_fp->playOggSound("sc4_stop2.ogg", g_fp->_soundStream4);
-			g_vars->scene04_musicStage = 3;
+			if (g_fp->_stream2playing) { // Looop it
+				g_fp->playOggSound("sc4_loop.ogg", g_fp->_soundStream3);
+			} else {
+				g_fp->playOggSound("sc4_stop2.ogg", g_fp->_soundStream4);
+				g_vars->scene04_musicStage = 3;
+			}
 		}
 		break;
 	case 3: