From 5301edc38306c27143f38d74085e6c095688f6aa Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 10 Oct 2003 13:55:08 +0000
Subject: some cleanup

svn-id: r10720
---
 sky/disk.cpp | 9 +++------
 sky/disk.h   | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'sky')

diff --git a/sky/disk.cpp b/sky/disk.cpp
index 010953194f..61c4fc87db 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -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 @@ SkyDisk::SkyDisk(const char *gameDataPath) {
 
 	_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 @@ SkyDisk::SkyDisk(const char *gameDataPath) {
 
 	_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);
 
diff --git a/sky/disk.h b/sky/disk.h
index a369ae32c3..01905a9b2d 100644
--- a/sky/disk.h
+++ b/sky/disk.h
@@ -24,6 +24,7 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
+#include "common/str.h"
 
 class File;
 
@@ -38,7 +39,7 @@ struct PrefFile {
 
 class SkyDisk {
 public:
-	SkyDisk(const char *gameDataPath);
+	SkyDisk(const Common::String &gameDataPath);
 	~SkyDisk(void);
 
 	uint8 *loadFile(uint16 fileNr, uint8 *dest);
-- 
cgit v1.2.3