[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.59,1.60 file.h,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19289/common

Modified Files:
	file.cpp file.h 
Log Message:
Reversed param order of File::open() -- this allowed me to get rid of a few more getGameDataPath() calls

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- file.cpp	17 Apr 2004 16:29:02 -0000	1.59
+++ file.cpp	27 Jun 2004 22:14:32 -0000	1.60
@@ -140,7 +140,7 @@
 	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;

Index: file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- file.h	17 Apr 2004 16:29:02 -0000	1.23
+++ file.h	27 Jun 2004 22:14:32 -0000	1.24
@@ -48,8 +48,7 @@
 	
 	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;