[Scummvm-cvs-logs] CVS: scummvm/kyra sound.cpp,1.10,1.11

James Brown ender at users.sourceforge.net
Mon Dec 12 20:13:00 CET 2005


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19597/kyra

Modified Files:
	sound.cpp 
Log Message:
Quiet warning in gcc 3.3.6


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.cpp	18 Oct 2005 01:30:18 -0000	1.10
+++ sound.cpp	13 Dec 2005 04:11:57 -0000	1.11
@@ -250,7 +250,8 @@
 	MusicPlayer *music = (MusicPlayer *)refCon;
 
 	// this should be set to the fadeToBlack value
-	const static uint32 musicFadeTime = 2 * 1000;
+	static const uint32 musicFadeTime = 2 * 1000;
+
 	if (music->_fadeMusicOut && music->_fadeStartTime + musicFadeTime > music->_engine->_system->getMillis()) {
 		byte volume = (byte)((musicFadeTime - (music->_engine->_system->getMillis() - music->_fadeStartTime)) * 255 / musicFadeTime);
 		music->setVolume(volume);





More information about the Scummvm-git-logs mailing list