[Scummvm-cvs-logs] CVS: scummvm/sword1 music.cpp,1.25,1.26 sword1.cpp,1.45,1.46

[Torbjörn Andersson]

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

Modified Files:
	music.cpp sword1.cpp 
Log Message:
Added "MUSIC" / "music" to the list of default directories.


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- music.cpp	13 Mar 2004 12:04:18 -0000	1.25
+++ music.cpp	28 Jun 2004 08:45:09 -0000	1.26
@@ -184,7 +184,7 @@
 			newStream = 0;
 		}
 		char fName[20];
-		sprintf(fName, "music/%s.wav", _tuneList[tuneId]);
+		sprintf(fName, "%s.wav", _tuneList[tuneId]);
 		if (_handles[newStream].play(fName, loopFlag != 0)) {
 			delete _converter[newStream];
 			_converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- sword1.cpp	28 Jun 2004 00:06:31 -0000	1.45
+++ sword1.cpp	28 Jun 2004 08:45:09 -0000	1.46
@@ -100,9 +100,11 @@
 
 	// Add default file directories
 	File::addDefaultDirectory(_gameDataPath + "/CLUSTERS/");
+	File::addDefaultDirectory(_gameDataPath + "/MUSIC/");
 	File::addDefaultDirectory(_gameDataPath + "/SPEECH/");
 	File::addDefaultDirectory(_gameDataPath + "/VIDEO/");
 	File::addDefaultDirectory(_gameDataPath + "/clusters/");
+	File::addDefaultDirectory(_gameDataPath + "/music/");
 	File::addDefaultDirectory(_gameDataPath + "/speech/");
 	File::addDefaultDirectory(_gameDataPath + "/video/");