diff options
author | Eugene Sandulenko | 2006-03-25 19:30:10 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2006-03-25 19:30:10 +0000 |
commit | e373c9b7b56d3b4b80ab2357363fdc4e48c97e16 (patch) | |
tree | e8932f866a6470dd6da33185defa6b2ec22b6e14 /common/file.cpp | |
parent | f25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00 (diff) | |
download | scummvm-rg350-e373c9b7b56d3b4b80ab2357363fdc4e48c97e16.tar.gz scummvm-rg350-e373c9b7b56d3b4b80ab2357363fdc4e48c97e16.tar.bz2 scummvm-rg350-e373c9b7b56d3b4b80ab2357363fdc4e48c97e16.zip |
- Revert my last change with moving addDefaultDirectory() from TheneNew.cpp
- Removed locking of further directory adds because it did not work for themes.
svn-id: r21452
Diffstat (limited to 'common/file.cpp')
-rw-r--r-- | common/file.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/common/file.cpp b/common/file.cpp index 5a50d24233..b5e2857905 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -32,7 +32,6 @@ namespace Common { StringList File::_defaultDirectories; File::FilesMap File::_filesMap; -bool File::_lockedDirectories; static FILE *fopenNoCase(const char *filename, const char *directory, const char *mode) { @@ -108,14 +107,9 @@ static FILE *fopenNoCase(const char *filename, const char *directory, const char return file; } -void File::addDefaultDirectory(const String &directory, bool lockDirectories) { +void File::addDefaultDirectory(const String &directory) { String lfn; - if (_lockedDirectories) - error("addDefaultDirectory is called too late. Move all calls to engine constructor"); - - _lockedDirectories = lockDirectories; - FilesystemNode dir(directory.c_str()); if (!dir.isDirectory()) @@ -139,9 +133,6 @@ void File::addDefaultDirectoryRecursive(const String &directory, int level, int String lfn; - if (_lockedDirectories) - error("addDefaultDirectoryRecursive is called too late. Move all calls to engine constructor"); - FilesystemNode dir(directory.c_str()); if (!dir.isDirectory()) @@ -176,12 +167,10 @@ void File::addDefaultDirectoryRecursive(const String &directory, int level, int void File::resetDefaultDirectories() { _defaultDirectories.clear(); _filesMap.clear(); - _lockedDirectories = false; } File::File() : _handle(0), _ioFailed(false), _refcount(1) { - _lockedDirectories = false; } //#define DEBUG_FILE_REFCOUNT |