diff options
author | Bertram <bertram@cegetel.net> | 2009-10-22 02:36:35 +0200 |
---|---|---|
committer | Bertram <bertram@cegetel.net> | 2009-10-22 02:36:35 +0200 |
commit | 078544a2dcc54cd3e52914a39d0cbebfc62024f4 (patch) | |
tree | 96a165e793f9bf84d9bcdc3fd0a5e78e9d9d5fb6 /src/main.cpp | |
parent | 3c6d873fe5584c41a0038758e52ecca843c1e182 (diff) | |
download | mana-078544a2dcc54cd3e52914a39d0cbebfc62024f4.tar.gz mana-078544a2dcc54cd3e52914a39d0cbebfc62024f4.tar.bz2 mana-078544a2dcc54cd3e52914a39d0cbebfc62024f4.tar.xz mana-078544a2dcc54cd3e52914a39d0cbebfc62024f4.zip |
Made the -d data path don't be bothered by updates and customdata files.
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index 92cbae77..87709e5b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1042,14 +1042,17 @@ int main(int argc, char *argv[]) case STATE_LOAD_DATA: logger->log("State: LOAD DATA"); - // Load the updates downloaded so far... - loadUpdates(); - - // Also add customdata directory - ResourceManager::getInstance()->searchAndAddArchives( - "customdata/", - "zip", - false); + if (options.dataPath.empty()) + { + // Load the updates downloaded so far... + loadUpdates(); + + // Also add customdata directory + ResourceManager::getInstance()->searchAndAddArchives( + "customdata/", + "zip", + false); + } // Load XML databases ColorDB::load(); |