[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.30,1.31

Robert G?ffringmann lavosspawn at users.sourceforge.net
Mon Jul 7 09:41:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv26799/sky

Modified Files:
	intro.cpp 
Log Message:
applied patch #766751 (BASS: Waiting for floppy intro music to finish) and fixed music bug (jukebox at St. James didn't stop playing)

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- intro.cpp	7 Jul 2003 00:27:31 -0000	1.30
+++ intro.cpp	7 Jul 2003 16:40:27 -0000	1.31
@@ -32,6 +32,7 @@
             _mixer->stopAll();
 #define CHECK_ESC if (_key_pressed == 27) { _skyScreen->stopSequence(); REMOVE_INTRO return false; }
 #define WAIT_SEQUENCE while (_skyScreen->sequenceRunning()) { checkCommands(commandPtr); delay(50); CHECK_ESC }
+#define WAIT_MUSIC while (_skyMusic->musicIsPlaying()) { delay(50); CHECK_ESC }
 
 #define INTRO_TEXT_WIDTH    128
 
@@ -348,10 +349,22 @@
 
 		commandPtr = (uint32 *)anim5Commands;
 		
-		WAIT_SEQUENCE;
 		_skyDisk->prefetchFile(FN_6_PAL);
 		_skyDisk->prefetchFile(FN_6_LOG);
 		_skyDisk->prefetchFile(FN_6A);
+		
+		WAIT_SEQUENCE;
+
+		// There is no synchronization mechanism between the music and
+		// the graphics. Which means that there is no guarantee that
+		// they both end at the same time. So just to be safe, wait
+		// for the music to stop before continuing with the final part.
+		//
+		// This part of the intro looks pretty nice even as a static
+		// image, so it makes sense to do the waiting before fading
+		// down the palette.
+
+		WAIT_MUSIC;
 
 		_skyScreen->fnFadeDown(0);
 		_skyScreen->showScreen(FN_6_LOG);





More information about the Scummvm-git-logs mailing list