diff options
| author | Eugene Sandulenko | 2006-03-25 19:18:09 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-03-25 19:18:09 +0000 |
| commit | f25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00 (patch) | |
| tree | 08c8f04fdf2d9967f6d56da3e3c8a80b539975e7 | |
| parent | ef6baca2ac40bc4652bba9a791db96ca07b2a6a9 (diff) | |
| download | scummvm-rg350-f25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00.tar.gz scummvm-rg350-f25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00.tar.bz2 scummvm-rg350-f25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00.zip | |
- Move AddDefaultDirectory() calls in somon engine to constructor
- Move AddDefaultDirectory() from NewTheme.cpp to main.cpp
svn-id: r21451
| -rw-r--r-- | base/main.cpp | 5 | ||||
| -rw-r--r-- | engines/simon/simon.cpp | 6 | ||||
| -rw-r--r-- | gui/ThemeNew.cpp | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/base/main.cpp b/base/main.cpp index dba2eeacb7..cd118ade30 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -314,6 +314,11 @@ static int runGame(GameDetector &detector, OSystem &system, const Common::String 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 and lock further additions Common::File::addDefaultDirectory(".", true); diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index ab4dfb3d53..93e5a7f563 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -453,9 +453,6 @@ SimonEngine::SimonEngine(OSystem *syst) memcpy (_hebrew_char_widths, "\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32); -} - -int SimonEngine::init(GameDetector &detector) { // Add default file directories for Acorn version File::addDefaultDirectory(_gameDataPath + "execute/"); @@ -471,6 +468,9 @@ int SimonEngine::init(GameDetector &detector) { File::addDefaultDirectory(_gameDataPath + "SFX/"); File::addDefaultDirectory(_gameDataPath + "speech/"); File::addDefaultDirectory(_gameDataPath + "SPEECH/"); +} + +int SimonEngine::init(GameDetector &detector) { // Detect game if (!initGame()) { diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index dc0bfc0e05..bb822d7e6f 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -131,12 +131,6 @@ _lastUsedBitMask(0), _forceRedraw(false), _font(0), _imageHandles(0), _images(0) } } - if (ConfMan.hasKey("extrapath")) { - Common::File::addDefaultDirectory(ConfMan.get("extrapath")); - } - if (ConfMan.hasKey("themepath")) { - Common::File::addDefaultDirectory(ConfMan.get("themepath")); - } ImageMan.addArchive(stylefile + ".zip"); if (!_configFile.loadFromFile(stylefile + ".ini")) { |