[Scummvm-cvs-logs] CVS: scummvm/bs2 function.cpp,1.16,1.17

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Sep 27 09:11:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv2441

Modified Files:
	function.cpp 
Log Message:
Save enough information about the currently playing music before the
credits so that it can be properly resumed afterwards.


Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/function.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- function.cpp	27 Sep 2003 11:02:56 -0000	1.16
+++ function.cpp	27 Sep 2003 16:10:42 -0000	1.17
@@ -391,13 +391,12 @@
 		uint8 oldPal[1024];
 		uint8 tmpPal[1024];
 		int32 music_length;
-		uint32 safe_looping_music_id;
 		int32 pars[2];
 
 		// FIXME: We need a better method for saving/restoring the
 		// music state as this one only restarts looping music.
 
-		safe_looping_music_id = looping_music_id;
+		g_sound->saveMusicState();
 
 		g_sound->MuteFx(1);
 		g_sound->MuteSpeech(1);
@@ -446,14 +445,8 @@
 			g_system->delay_msecs(30);
 		}
 
-		looping_music_id = safe_looping_music_id;
-
-		if (looping_music_id) {
-			pars[0] = looping_music_id;
-			pars[1] = FX_LOOP;
-			FN_play_music(pars);
-		} else
-			FN_stop_music(NULL);
+		FN_stop_music(NULL);
+		g_sound->restoreMusicState();
 
 		BS2_SetPalette(0, 256, oldPal, RDPAL_FADE);
 		FadeUp(0.75);





More information about the Scummvm-git-logs mailing list