[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.54,1.55

[Max Horn]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv17256/bs2/driver

Modified Files:
	d_sound.cpp 
Log Message:
added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- d_sound.cpp	16 Sep 2003 07:11:29 -0000	1.54
+++ d_sound.cpp	17 Sep 2003 21:06:14 -0000	1.55
@@ -379,7 +379,7 @@
 	File fp;
 	
 	// Open the speech cluster and find the data offset & size
-	fp.open(filename, g_engine->getGameDataPath());
+	fp.open(filename);
 	if (fp.isOpen() == false)
 		return 0;
 
@@ -412,7 +412,7 @@
 	File fp;
 
 	// Open the speech cluster and find the data offset & size
-	fp.open(filename, g_engine->getGameDataPath());
+	fp.open(filename);
 	if (fp.isOpen() == false)
 		return RDERR_INVALIDFILENAME;
 
@@ -499,7 +499,7 @@
 			return RDERR_SPEECHPLAYING;
 
 		//  Open the speech cluster and find the data offset & size
-		fp.open(filename, g_engine->getGameDataPath());
+		fp.open(filename);
 		if (fp.isOpen() == false) 
 			return RDERR_INVALIDFILENAME;
 		
@@ -1058,7 +1058,7 @@
 	// Always use fpMus[0] (all music in one cluster)
 	// musFilePos[primaryStream] for different pieces of music.
 	if (!fpMus.isOpen())
-		fpMus.open(filename, g_engine->getGameDataPath());
+		fpMus.open(filename);
 
 	if (!fpMus.isOpen())
 		return RDERR_INVALIDFILENAME;