[Scummvm-cvs-logs] CVS: scummvm/queen musicdata.cpp,1.4,1.5 sound.cpp,1.32,1.33 sound.h,1.15,1.16

[Travis Howell]

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

Modified Files:
	musicdata.cpp sound.cpp sound.h 
Log Message:

Add support for music in fotaq demos


Index: musicdata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/musicdata.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- musicdata.cpp	22 Jan 2004 23:09:46 -0000	1.4
+++ musicdata.cpp	25 Jan 2004 05:03:35 -0000	1.5
@@ -24,6 +24,65 @@
 
 namespace Queen {
 
+const songData Sound::_songDemo[] = {
+	/* 1 - Hotel Gangsters */
+	{ { 1, 0 }, 128, 180, 0, 1, 0 }, 
+
+	/* 2 - Arrive Hotel */
+	{ { 42, 0 }, 128, 180, 0, 1, 0 }, 
+
+	/* 3 - Jungle */
+	{ { 3, 4, 5, 6, 0 }, 128, 0, 0, 1, 0 }, 
+
+	/* 4 - Waterfall On */
+	{ { 7, 0 }, 128, 0, 0, 0, 0 }, 
+
+	/* 5 - Vnormal */
+	{ { 8, 0 }, 128, 0, 0, 2, 0 }, 
+
+	/* 6 - Bells? */
+	{ { 9, 0 }, 120, 0, 0, 1, 0 }, 
+
+	/* 7 - Jetty Music */
+	{ { 10, 0 }, 128, 0, 0, 1, 0 }, 
+
+	/* 8 - Ferry Music */
+	{ { 11, 0 }, 128, 0, 0, 1, 0 }, 
+
+	/* 9 - Temple Upstairs */
+	{ { 12, 0 }, 128, 0, 0, 1, 0 }, 
+
+	/* 10 - NULL */
+	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+
+	/* 11 - NULL */
+	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+
+	/* 12 - NULL */
+	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+
+	/* 13 - NULL */
+	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+
+	/* 14 - Unknown */
+	{ { 17, 0 }, 120, 0, 0, 2, 0 }, 
+
+	/* 15 - Unknown */
+	{ { 18, 0 }, 110, 0, 0, 2, 0 }, 
+
+	/* 16 - Floda Upstairs */
+	{ { 19, 0 }, 110, 0, 0, 1, 0 }, 
+
+	/* 17 - Floda Lab */
+	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+
+	/* 18 - NULL */
+	{ { 0, 0 }, 0, 0, 0, 0, 0 }, 
+
+	/* 19 - Hotel Lola */
+	{ { 22, 0 }, 120, 180, 0, 1, 0 }, 
+};
+
 const songData Sound::_song[] = {
 	/* 1 - Hotel Gangsters */
 	{ { 1, 0 }, 128, 180, 0, 1, 0 }, 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sound.cpp	22 Jan 2004 23:09:52 -0000	1.32
+++ sound.cpp	25 Jan 2004 05:03:35 -0000	1.33
@@ -99,7 +99,12 @@
 		return;
 	}
 	
-	int16 newTune = _song[songNum - 1].tuneList[0] - 1;
+	int16 newTune;
+	if (_vm->resource()->isDemo()) {
+		newTune = _songDemo[songNum - 1].tuneList[0] - 1;
+	} else {
+		newTune = _song[songNum - 1].tuneList[0] - 1;
+	}
 
 	if (_tune[newTune].sfx[0]) {
 		if (sfxOn())
@@ -107,10 +112,11 @@
 		return;
 	}
 
-	if (!musicOn() || _vm->resource()->isDemo())
+	if (!musicOn())
 		return;
 
-	switch (_song[songNum - 1].override) {
+	int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override;
+	switch (override) {
 		// Override all songs
 		case  1:
 			break;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sound.h	22 Jan 2004 23:10:05 -0000	1.15
+++ sound.h	25 Jan 2004 05:03:35 -0000	1.16
@@ -78,6 +78,7 @@
 	void saveState(byte *&ptr);
 	void loadState(uint32 ver, byte *&ptr);
 
+	static const songData _songDemo[];
 	static const songData _song[];
 	static const tuneData _tune[];
 	static const char *_sfxName[];