From cd528083f955dece5bf1c97085efc1d8b0e5857f Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Wed, 26 Apr 2006 14:05:34 +0000
Subject: [PATCH] Removed 'directory' parameter of File::open

svn-id: r22183
---
 common/file.cpp | 7 +++----
 common/file.h   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/file.cpp b/common/file.cpp
index 267b993276f..f7632b0b758 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -184,7 +184,7 @@ void File::decRef() {
 }
 
 
-bool File::open(const String &filename, AccessMode mode, const char *directory) {
+bool File::open(const String &filename, AccessMode mode) {
 	assert(mode == kFileReadMode || mode == kFileWriteMode);
 
 	if (filename.empty()) {
@@ -201,9 +201,8 @@ bool File::open(const String &filename, AccessMode mode, const char *directory)
 	fname.toLowercase();
 
 	const char *modeStr = (mode == kFileReadMode) ? "rb" : "wb";
-	if (mode == kFileWriteMode || directory) {
-		String dir(directory ? directory : "");
-		_handle = fopenNoCase(filename, dir, modeStr);
+	if (mode == kFileWriteMode) {
+		_handle = fopenNoCase(filename, "", modeStr);
 	} else if (_filesMap && _filesMap->contains(fname)) {
 		fname = (*_filesMap)[fname];
 		debug(3, "Opening hashed: %s", fname.c_str());
diff --git a/common/file.h b/common/file.h
index 995e776a827..eafb7adba92 100644
--- a/common/file.h
+++ b/common/file.h
@@ -60,7 +60,7 @@ public:
 	void incRef();
 	void decRef();
 
-	virtual bool open(const String &filename, AccessMode mode = kFileReadMode, const char *directory = NULL);
+	virtual bool open(const String &filename, AccessMode mode = kFileReadMode);
 	static bool exists(const String &filename);
 
 	virtual void close();