thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed 'directory' parameter of File::open

Browse source 
svn-id: r22183
This commit is contained in:
Max Horn 2006-04-26 14:05:34 +00:00
parent 092fd96145
commit cd528083f9
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/file.cpp
View file

@ -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); assert(mode == kFileReadMode || mode == kFileWriteMode);
if (filename.empty()) { if (filename.empty()) {
@ -201,9 +201,8 @@ bool File::open(const String &filename, AccessMode mode, const char *directory)
fname.toLowercase(); fname.toLowercase();
const char *modeStr = (mode == kFileReadMode) ? "rb" : "wb"; const char *modeStr = (mode == kFileReadMode) ? "rb" : "wb";
if (mode == kFileWriteMode || directory) { if (mode == kFileWriteMode) {
String dir(directory ? directory : ""); _handle = fopenNoCase(filename, "", modeStr);
_handle = fopenNoCase(filename, dir, modeStr);
} else if (_filesMap && _filesMap->contains(fname)) { } else if (_filesMap && _filesMap->contains(fname)) {
fname = (*_filesMap)[fname]; fname = (*_filesMap)[fname];
debug(3, "Opening hashed: %s", fname.c_str()); debug(3, "Opening hashed: %s", fname.c_str());

2
common/file.h
View file

@ -60,7 +60,7 @@ public:
void incRef(); void incRef();
void decRef(); 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); static bool exists(const String &filename);
virtual void close(); virtual void close();