[Scummvm-cvs-logs] CVS: scummvm/sky/music musicbase.cpp,1.2,1.3

Robert G?ffringmann lavosspawn at users.sourceforge.net
Tue Jun 17 05:27:07 CEST 2003


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

Modified Files:
	musicbase.cpp 
Log Message:
don't restart music if the same track is already playing

Index: musicbase.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/music/musicbase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- musicbase.cpp	1 Jun 2003 21:21:10 -0000	1.2
+++ musicbase.cpp	17 Jun 2003 12:26:25 -0000	1.3
@@ -148,7 +148,8 @@
 	uint8 newTempo;
 	if (_onNextPoll.doReInit) startDriver();
 	if (_onNextPoll.doStopMusic) stopMusic();
-	if (_onNextPoll.musicToProcess) loadNewMusic();
+	if (_onNextPoll.musicToProcess == _currentMusic) _onNextPoll.musicToProcess = 0;
+	if (_onNextPoll.musicToProcess)	loadNewMusic();
 
 	_aktTime += _tempo;
 





More information about the Scummvm-git-logs mailing list