From b8ad54b3af1de97bf986e7e4d4da97f02ece3273 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 27 Jun 2004 22:14:35 +0000
Subject: Reversed param order of File::open() -- this allowed me to get rid of
 a few more getGameDataPath() calls

svn-id: r14090
---
 common/file.cpp | 2 +-
 common/file.h   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'common')

diff --git a/common/file.cpp b/common/file.cpp
index 24c8907002..26f6fcb603 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -140,7 +140,7 @@ File::~File() {
 	delete [] _name;
 }
 
-bool File::open(const char *filename, const char *directory, AccessMode mode) {
+bool File::open(const char *filename, AccessMode mode, const char *directory) {
 	if (_handle) {
 		debug(2, "File %s already opened", filename);
 		return false;
diff --git a/common/file.h b/common/file.h
index ba8eb469e4..3a268ecc5b 100644
--- a/common/file.h
+++ b/common/file.h
@@ -48,8 +48,7 @@ public:
 	
 	File();
 	virtual ~File();
-	bool open(const char *filename, const Common::String &directory) { return open(filename, directory.c_str()); }
-	bool open(const char *filename, const char *directory = NULL, AccessMode mode = kFileReadMode);
+	bool open(const char *filename, AccessMode mode = kFileReadMode, const char *directory = NULL);
 	void close();
 	bool isOpen() const;
 	bool ioFailed() const;
-- 
cgit v1.2.3