From afc79a99e11dca7f22804da4b6694b79b27a13c8 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Thu, 19 May 2011 15:46:40 -0300 Subject: [PATCH] rework on resources system --- src/framework/core/resources.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/framework/core/resources.cpp b/src/framework/core/resources.cpp index 53e84b95..354e10f8 100644 --- a/src/framework/core/resources.cpp +++ b/src/framework/core/resources.cpp @@ -43,12 +43,19 @@ void Resources::init(const char *argv0) possibleDirs.push_back("data"); possibleDirs.push_back(baseDir + "data"); possibleDirs.push_back(baseDir + "../data"); - possibleDirs.push_back(baseDir + "../share/data"); + possibleDirs.push_back(baseDir + "../share/otclient/data"); possibleDirs.push_back(""); - foreach(dir, possibleDirs) - if(g_resources.addToSearchPath(dir)) + bool found = false; + foreach(dir, possibleDirs) { + if(g_resources.addToSearchPath(dir)) { + flogInfo("Using data directory: %s", dir.c_str()); + found = true; break; + } + } + if(!found) + logFatal("ERROR: could not find data directory"); // setup write directory dir = Platform::getAppUserDir();