[Scummvm-cvs-logs] SF.net SVN: scummvm: [22183] scummvm/trunk/common

[fingolfin at users.sourceforge.net]

Revision: 22183
Author:   fingolfin
Date:     2006-04-26 07:05:34 -0700 (Wed, 26 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22183&view=rev

Log Message:
-----------
Removed 'directory' parameter of File::open

Modified Paths:
--------------
    scummvm/trunk/common/file.cpp
    scummvm/trunk/common/file.h
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2006-04-26 14:05:09 UTC (rev 22182)
+++ scummvm/trunk/common/file.cpp	2006-04-26 14:05:34 UTC (rev 22183)
@@ -184,7 +184,7 @@
 }
 
 
-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 @@
 	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());

Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h	2006-04-26 14:05:09 UTC (rev 22182)
+++ scummvm/trunk/common/file.h	2006-04-26 14:05:34 UTC (rev 22183)
@@ -60,7 +60,7 @@
 	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();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.