[Scummvm-cvs-logs] CVS: scummvm/queen music.cpp,1.4,1.5 sound.cpp,1.26,1.27

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv13575/queen

Modified Files:
	music.cpp sound.cpp 
Log Message:
Demo uses different file for music (and disable it for now)


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/music.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- music.cpp	28 Dec 2003 03:56:13 -0000	1.4
+++ music.cpp	29 Dec 2003 15:50:17 -0000	1.5
@@ -38,8 +38,13 @@
 		_midi->setTimerRate(_driver->getBaseTempo());
 		_driver->setTimerCallback(this, myTimerProc);			
 		
-		_musicData = vm->resource()->loadFile("AQ.RL", 0, NULL);
-		_musicDataSize = vm->resource()->fileSize("AQ.RL");
+		if (vm->resource()->isDemo()) {
+			_musicData = vm->resource()->loadFile("AQ8.RL", 0, NULL);
+			_musicDataSize = vm->resource()->fileSize("AQ8.RL");
+		} else {
+			_musicData = vm->resource()->loadFile("AQ.RL", 0, NULL);
+			_musicDataSize = vm->resource()->fileSize("AQ.RL");
+		}
 		_numSongs = READ_LE_UINT16(_musicData);
 	}
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sound.cpp	29 Dec 2003 13:18:23 -0000	1.26
+++ sound.cpp	29 Dec 2003 15:50:17 -0000	1.27
@@ -107,7 +107,7 @@
 		return;
 	}
 
-	if (!musicOn())
+	if (!musicOn() || _vm->resource()->isDemo())
 		return;
 
 	_lastOverride = songNum;