[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.13,1.14

[Nicolas Bacca]

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

Modified Files:
	music.cpp 
Log Message:
Yet another stupid EVC fix

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- music.cpp	25 Jan 2004 16:48:06 -0000	1.13
+++ music.cpp	26 Jan 2004 07:38:26 -0000	1.14
@@ -290,6 +290,8 @@
 	}
 
 	uint16 MusicPlayer::nextValidSong() {
+		int i;
+
 		if (_randomLoop && validSongs() > 1) {
 			uint8 pos = randomQueuePos(); 
 			while(isBadSong(_songQueue[pos]))
@@ -301,13 +303,13 @@
 		if (!_looping && validSongs() < 2)
 			return 0;
 		
-		for (int i = _queuePos + 1; i < MUSIC_QUEUE_SIZE; i++)  
+		for (i = _queuePos + 1; i < MUSIC_QUEUE_SIZE; i++)  
 			if (_songQueue[i] && !isBadSong(_songQueue[i])) {
 				_queuePos = i;
 				return _songQueue[i];
 			}
 
-		for (int i = 0; i < _queuePos; i++) 
+		for (i = 0; i < _queuePos; i++) 
 			if (_songQueue[i] && !isBadSong(_songQueue[i])) {
 				_queuePos = i;
 				return _songQueue[i];