From 078544a2dcc54cd3e52914a39d0cbebfc62024f4 Mon Sep 17 00:00:00 2001 From: Bertram Date: Thu, 22 Oct 2009 02:36:35 +0200 Subject: Made the -d data path don't be bothered by updates and customdata files. --- src/main.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/main.cpp') 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(); -- cgit v1.2.3-70-g09d2