libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 16:26:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed bug #1001069; clarified/simplified some error messages

Browse Source 
svn-id: r14375
This commit is contained in:
Max Horn 2004-07-31 09:34:10 +00:00
parent 02e6d64ee7
commit cef2de6a69
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/file.cpp
View File

@ -125,18 +125,14 @@ void File::decRef() {
bool File::open(const char *filename, AccessMode mode, const char *directory) {
assert(mode == kFileReadMode || mode == kFileWriteMode);
if (_handle) {
error("File %s already opened", filename);
return false;
error("File::open: This file object already is opened (%s), won't open '%s'", _name, filename);
}
if (filename == NULL || *filename == 0) {
return false;
}
if (mode != kFileReadMode && mode != kFileWriteMode) {
error("Only read/write mode supported!");
return false;
error("File::open: No filename was specified!");
}
clearIOFailed();
@ -146,6 +142,9 @@ bool File::open(const char *filename, AccessMode mode, const char *directory) {
_handle = fopenNoCase(filename, directory, modeStr);
} else {
Common::StringList::const_iterator x;
// First try the current directory
_handle = fopenNoCase(filename, "", modeStr);
// Next try all default directories
for (x = _defaultDirectories.begin(); _handle == NULL && x != _defaultDirectories.end(); ++x) {
_handle = fopenNoCase(filename, x->c_str(), modeStr);
}