diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-10-21 19:46:59 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-21 19:46:59 -0600 |
commit | 7e9cd47d1aa10f7b556d04903d20f8884ca3eb35 (patch) | |
tree | 198cef1684e7a198c4017dbd8732629fb1270bca /src/main.cpp | |
parent | 078544a2dcc54cd3e52914a39d0cbebfc62024f4 (diff) | |
download | mana-7e9cd47d1aa10f7b556d04903d20f8884ca3eb35.tar.gz mana-7e9cd47d1aa10f7b556d04903d20f8884ca3eb35.tar.bz2 mana-7e9cd47d1aa10f7b556d04903d20f8884ca3eb35.tar.xz mana-7e9cd47d1aa10f7b556d04903d20f8884ca3eb35.zip |
Revert "Made the -d data path don't be bothered by updates and customdata files."
This reverts commit 078544a2dcc54cd3e52914a39d0cbebfc62024f4.
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/main.cpp b/src/main.cpp index 87709e5b..92cbae77 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1042,17 +1042,14 @@ int main(int argc, char *argv[]) case STATE_LOAD_DATA: logger->log("State: LOAD DATA"); - if (options.dataPath.empty()) - { - // Load the updates downloaded so far... - loadUpdates(); - - // Also add customdata directory - ResourceManager::getInstance()->searchAndAddArchives( - "customdata/", - "zip", - false); - } + // Load the updates downloaded so far... + loadUpdates(); + + // Also add customdata directory + ResourceManager::getInstance()->searchAndAddArchives( + "customdata/", + "zip", + false); // Load XML databases ColorDB::load(); |