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

Travis Howell kirben at users.sourceforge.net
Tue Jan 27 09:35:53 CET 2004


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

Modified Files:
	music.cpp 
Log Message:

Check for demo version.


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- music.cpp	25 Jan 2004 12:50:15 -0000	1.12
+++ music.cpp	25 Jan 2004 16:48:06 -0000	1.13
@@ -166,7 +166,8 @@
 			return;
 		}
 		
-		switch (Sound::_tune[tuneList].mode) {
+		int mode = (_numSongs == 40) ? Sound::_tuneDemo[tuneList].mode : Sound::_tune[tuneList].mode;
+		switch (mode) {
 			//Random loop
 			case  0:
 				_randomLoop = true;
@@ -187,8 +188,13 @@
 		}
 		
 		int i = 0;
-		while(Sound::_tune[tuneList].tuneNum[i])
-			queueSong(Sound::_tune[tuneList].tuneNum[i++] - 1);
+		if (_numSongs == 40) {
+			while(Sound::_tuneDemo[tuneList].tuneNum[i])
+				queueSong(Sound::_tuneDemo[tuneList].tuneNum[i++] - 1);
+		} else {
+			while(Sound::_tune[tuneList].tuneNum[i])
+				queueSong(Sound::_tune[tuneList].tuneNum[i++] - 1);
+		}
 			
 		if (_randomLoop)
 			_queuePos = randomQueuePos();





More information about the Scummvm-git-logs mailing list