[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.50,1.51 disk.h,1.11,1.12

[Max Horn]

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

Modified Files:
	disk.cpp disk.h 
Log Message:
some cleanup

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- disk.cpp	10 Oct 2003 10:42:37 -0000	1.50
+++ disk.cpp	10 Oct 2003 13:55:07 -0000	1.51
@@ -31,12 +31,9 @@
 static const char *dataFilename = "sky.dsk";
 static const char *dinnerFilename = "sky.dnr";
 
-SkyDisk::SkyDisk(const char *gameDataPath) {
+SkyDisk::SkyDisk(const Common::String &gameDataPath) {
 	_prefRoot = NULL;
 
-	// Set default file directory
-	File::setDefaultDirectory(gameDataPath);
-
 	_dataDiskHandle = new File();
 	_dnrHandle = new File();
 
@@ -44,7 +41,7 @@
 
 	_dnrHandle->open(dinnerFilename);
 	if (_dnrHandle->isOpen() == false)
-			error("Could not open %s%s", gameDataPath, dinnerFilename);
+			error("Could not open %s%s", gameDataPath.c_str(), dinnerFilename);
 
 	if (!(_dinnerTableEntries = _dnrHandle->readUint32LE()))
 		error("Error reading from sky.dnr"); //even though it was opened correctly?!
@@ -57,7 +54,7 @@
 
 	_dataDiskHandle->open(dataFilename);
 	if (_dataDiskHandle->isOpen() == false) 
-		error("Error opening %s%s", gameDataPath, dataFilename);
+		error("Error opening %s%s", gameDataPath.c_str(), dataFilename);
 
 	printf("Found BASS version v0.0%d (%d dnr entries)\n", determineGameVersion(), _dinnerTableEntries);
 

Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- disk.h	10 Oct 2003 10:42:37 -0000	1.11
+++ disk.h	10 Oct 2003 13:55:08 -0000	1.12
@@ -24,6 +24,7 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
+#include "common/str.h"
 
 class File;
 
@@ -38,7 +39,7 @@
 
 class SkyDisk {
 public:
-	SkyDisk(const char *gameDataPath);
+	SkyDisk(const Common::String &gameDataPath);
 	~SkyDisk(void);
 
 	uint8 *loadFile(uint16 fileNr, uint8 *dest);