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

svn-id: r10278

1 files changed, 7 insertions, 3 deletions

diff --git a/common/file.h b/common/file.h
index 7d6ab8f395..c07d4e9d4a 100644
--- a/common/file.h
+++ b/common/file.h
@@ -33,17 +33,21 @@ private:
 	byte _encbyte;
 	char *_name;	// For debugging
 
-	FILE *fopenNoCase(const char *filename, const char *directory, const char *mode);
+	static FILE *fopenNoCase(const char *filename, const char *directory, const char *mode);
+	
+	static char *_defaultDirectory;
 
 public:
 	enum {
 		kFileReadMode = 1,
 		kFileWriteMode = 2
 	};
-
+	
+	static void setDefaultDirectory(const char *directory);
+	
 	File();
 	virtual ~File();
-	bool open(const char *filename, const char *directory, int mode = kFileReadMode, byte encbyte = 0);
+	bool open(const char *filename, const char *directory = NULL, int mode = kFileReadMode, byte encbyte = 0);
 	void close();
 	bool isOpen();
 	bool ioFailed();