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

[Torbj?rn Andersson]

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

Modified Files:
	music.cpp 
Log Message:
With Jamieson630's MIDI parser fix, all the ITE MIDIs should work.


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- music.cpp	1 May 2004 13:04:31 -0000	1.12
+++ music.cpp	1 May 2004 16:49:23 -0000	1.13
@@ -159,7 +159,7 @@
 
 int Music::play(uint32 music_rn, uint16 flags) {
 	R_RSCFILE_CONTEXT *rsc_ctxt = NULL;
-	const char *midi_file = NULL;
+	const char *midi_file;
 
 	byte *resource_data;
 	size_t resource_size;
@@ -218,27 +218,19 @@
 		break;
 	case XXX:
 		midi_file = "exploreb";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "explorec";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "fvillage";
 		break;
 	case XXX:
 		midi_file = "humruinm";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 #endif
 	case 10:
 		midi_file = "intro";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 #if 0
 	case XXX:
@@ -249,43 +241,27 @@
 		break;
 	case XXX:
 		midi_file = "nitstrlm";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "orbtempl";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "reset";
-		// Unfortunately, our MIDI parser won't handle the above file,
-		// but I'm not sure we need it anyway
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "shiala";
 		break;
 	case XXX:
 		midi_file = "spooky";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "sunstatm";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "sweet";
-		// Unfortunately, our MIDI parser won't handle the above file
-		midi_file = NULL;
 		break;
 	case XXX:
 		midi_file = "tychom";
-		// Unlike the other unhandled files, ScummVM won't crash on
-		// this one. But it won't play anything either.
-		midi_file = NULL;
 		break;
 #endif
 	default: