[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.45,1.46 disk.h,1.8,1.9

[Max Horn]

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

Modified Files:
	disk.cpp disk.h 
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: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- disk.cpp	6 Sep 2003 03:48:08 -0000	1.45
+++ disk.cpp	17 Sep 2003 21:06:16 -0000	1.46
@@ -32,16 +32,18 @@
 
 SkyDisk::SkyDisk(char *gameDataPath) {
 	_prefRoot = NULL;
-	_gameDataPath = gameDataPath;
+
+	// Set default file directory
+	File::setDefaultDirectory(gameDataPath);
 
 	_dataDiskHandle = new File();
 	_dnrHandle = new File();
 
 	uint32 entriesRead;
 
-	_dnrHandle->open(dinnerFilename, _gameDataPath);
+	_dnrHandle->open(dinnerFilename);
 	if (_dnrHandle->isOpen() == false)
-			error("Could not open %s%s", _gameDataPath, dinnerFilename);
+			error("Could not open %s%s", gameDataPath, dinnerFilename);
 
 	if (!(_dinnerTableEntries = _dnrHandle->readUint32LE()))
 		error("Error reading from sky.dnr"); //even though it was opened correctly?!
@@ -52,9 +54,9 @@
 	if (entriesRead != _dinnerTableEntries)
 		warning("entriesRead != dinnerTableEntries. [%d/%d]", entriesRead, _dinnerTableEntries);
 
-	_dataDiskHandle->open(dataFilename, _gameDataPath);
+	_dataDiskHandle->open(dataFilename);
 	if (_dataDiskHandle->isOpen() == false) 
-		error("Error opening %s%s", _gameDataPath, dataFilename);
+		error("Error opening %s%s", gameDataPath, dataFilename);
 
 	printf("Found BASS version v0.0%d (%d dnr entries)\n", determineGameVersion(), _dinnerTableEntries);
 
@@ -414,9 +416,9 @@
 	filePtr = loadFile(fileNr, NULL);
 	sprintf(buf, "dumps/file-%d.dmp", fileNr);
 	
-	out.open(buf, "", 1);
+	out.open(buf, "", File::kFileReadMode);
 	if (out.isOpen() == false) {
-		out.open(buf, "", 2);
+		out.open(buf, "", File::kFileWriteMode);
 		if (out.isOpen() == false)
 			return;
 		out.write(filePtr, _lastLoadedFileSize);

Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- disk.h	12 Jul 2003 05:38:04 -0000	1.8
+++ disk.h	17 Sep 2003 21:06:16 -0000	1.9
@@ -64,7 +64,6 @@
 	uint8 *getFileInfo(uint16 fileNr);
 	void dumpFile(uint16 fileNr);
 
-	char *_gameDataPath;
 	uint32 _dinnerTableEntries;
 
 	uint8 *_dinnerTableArea, *_fixedDest, *_fileDest, *_compDest;