aboutsummaryrefslogtreecommitdiff
path: root/gui/ThemeNew.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2006-03-25 19:30:10 +0000
committerEugene Sandulenko2006-03-25 19:30:10 +0000
commite373c9b7b56d3b4b80ab2357363fdc4e48c97e16 (patch)
treee8932f866a6470dd6da33185defa6b2ec22b6e14 /gui/ThemeNew.cpp
parentf25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00 (diff)
downloadscummvm-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 'gui/ThemeNew.cpp')
-rw-r--r--gui/ThemeNew.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp
index bb822d7e6f..1db42320bc 100644
--- a/gui/ThemeNew.cpp
+++ b/gui/ThemeNew.cpp
@@ -131,6 +131,12 @@ _lastUsedBitMask(0), _forceRedraw(false), _font(0), _imageHandles(0), _images(0)
}
}
+ 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")) {