From 7e9cd47d1aa10f7b556d04903d20f8884ca3eb35 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Wed, 21 Oct 2009 19:46:59 -0600 Subject: Revert "Made the -d data path don't be bothered by updates and customdata files." This reverts commit 078544a2dcc54cd3e52914a39d0cbebfc62024f4. --- src/main.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src') 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(); -- cgit v1.2.3-60-g2f50