[Scummvm-cvs-logs] CVS: scummvm/sword2 sound.cpp,1.45,1.46

[Torbjörn Andersson]

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

Modified Files:
	sound.cpp 
Log Message:
Use the same code for opening the music clusters as for opening the speech
clusters. (No, that doesn't mean compressed music is support yet. This is
just a tiny little step closer.)


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- sound.cpp	1 May 2004 10:42:18 -0000	1.45
+++ sound.cpp	27 Aug 2004 08:31:33 -0000	1.46
@@ -326,24 +326,7 @@
 		_vm->_loopingMusicId = 0;
 	}
 
-	// add the appropriate file extension & play it
-
-	if (_scriptVars[DEMO]) {
-		// The demo I found didn't come with any music file, but you
-		// could use the music from the first CD of the complete game,
-		// I suppose...
-		strcpy(filename, "music.clu");
-	} else {
-		File f;
-
-		sprintf(filename, "music%d.clu", _vm->_resman->whichCd());
-		if (f.open(filename))
-			f.close();
-		else
-			strcpy(filename, "music.clu");
-	}
-
-	rv = _vm->_sound->streamCompMusic(filename, params[0], loopFlag);
+	rv = _vm->_sound->streamCompMusic(params[0], loopFlag);
 
 	if (rv)
 		debug(5, "ERROR: streamCompMusic(%s, %d, %d) returned error 0x%.8x", filename, params[0], loopFlag, rv);