[Scummvm-cvs-logs] SF.net SVN: scummvm: [21452] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Mar 25 11:44:07 CET 2006
Revision: 21452
Author: sev
Date: 2006-03-25 11:30:10 -0800 (Sat, 25 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21452&view=rev
Log Message:
-----------
- Revert my last change with moving addDefaultDirectory() from TheneNew.cpp
- Removed locking of further directory adds because it did not work for themes.
Modified Paths:
--------------
scummvm/trunk/base/main.cpp
scummvm/trunk/common/file.cpp
scummvm/trunk/common/file.h
scummvm/trunk/gui/ThemeNew.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2006-03-25 19:18:09 UTC (rev 21451)
+++ scummvm/trunk/base/main.cpp 2006-03-25 19:30:10 UTC (rev 21452)
@@ -314,14 +314,9 @@
if (ConfMan.hasKey("extrapath", Common::ConfigManager::kApplicationDomain))
Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath", Common::ConfigManager::kApplicationDomain));
- // Theme-related
- if (ConfMan.hasKey("themepath")) {
- Common::File::addDefaultDirectory(ConfMan.get("themepath"));
- }
+ // As a last resort add current directory
+ Common::File::addDefaultDirectory(".");
- // As a last resort add current directory and lock further additions
- Common::File::addDefaultDirectory(".", true);
-
int result;
// Init the engine (this might change the screen parameters
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp 2006-03-25 19:18:09 UTC (rev 21451)
+++ scummvm/trunk/common/file.cpp 2006-03-25 19:30:10 UTC (rev 21452)
@@ -32,7 +32,6 @@
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 @@
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 @@
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::resetDefaultDirectories() {
_defaultDirectories.clear();
_filesMap.clear();
- _lockedDirectories = false;
}
File::File()
: _handle(0), _ioFailed(false), _refcount(1) {
- _lockedDirectories = false;
}
//#define DEBUG_FILE_REFCOUNT
Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h 2006-03-25 19:18:09 UTC (rev 21451)
+++ scummvm/trunk/common/file.h 2006-03-25 19:30:10 UTC (rev 21452)
@@ -49,7 +49,6 @@
static StringList _defaultDirectories;
static FilesMap _filesMap;
- static bool _lockedDirectories;
public:
enum AccessMode {
@@ -57,7 +56,7 @@
kFileWriteMode = 2
};
- static void addDefaultDirectory(const String &directory, bool lockDirectories = false);
+ static void addDefaultDirectory(const String &directory);
static void addDefaultDirectoryRecursive(const String &directory, int level = 0, int baseLen = 0);
static void resetDefaultDirectories();
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp 2006-03-25 19:18:09 UTC (rev 21451)
+++ scummvm/trunk/gui/ThemeNew.cpp 2006-03-25 19:30:10 UTC (rev 21452)
@@ -131,6 +131,12 @@
}
}
+ if (ConfMan.hasKey("extrapath"))
+ Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath"));
+
+ if (ConfMan.hasKey("themepath"))
+ Common::File::addDefaultDirectory(ConfMan.get("themepath"));
+
ImageMan.addArchive(stylefile + ".zip");
if (!_configFile.loadFromFile(stylefile + ".ini")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list