Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-19 05:53:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

make framework more flexible, split cmake files

Browse Source
This commit is contained in:
Eduardo Bart
2011-12-05 04:44:03 -02:00
parent d2d8a0097a
commit ffeb34e0e7
26 changed files with 352 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/framework/core/resourcemanager.cpp
View File

@@ -32,31 +32,6 @@ ResourceManager g_resources;
void ResourceManager::init(const char *argv0)
{
PHYSFS_init(argv0);
// setup write directory
if(!g_resources.setupWriteDir())
logError("Could not setup write directory");
// try to find modules directory, all data lives there
//TODO: move this to Application class
std::string baseDir = PHYSFS_getBaseDir();
std::string possibleDirs[] = { "modules",
baseDir + "modules",
baseDir + "../modules",
baseDir + "../share/" + g_app.getAppName() + "/otclient/modules",
"" };
bool found = false;
for(const std::string& dir : possibleDirs) {
if(g_resources.addToSearchPath(dir)) {
logInfo("Using modules directory '", dir.c_str(), "'");
found = true;
break;
}
}
if(!found)
logFatal("Could not find modules directory");
}
void ResourceManager::terminate()
@@ -64,10 +39,10 @@ void ResourceManager::terminate()
PHYSFS_deinit();
}
bool ResourceManager::setupWriteDir()
bool ResourceManager::setupWriteDir(const std::string& appWriteDirName)
{
std::string userDir = PHYSFS_getUserDir();
std::string dirName = Fw::mkstr(".", g_app.getAppName());
std::string dirName = Fw::mkstr(".", appWriteDirName);
std::string writeDir = userDir + dirName;
if(!PHYSFS_setWriteDir(writeDir.c_str())) {
if(!PHYSFS_setWriteDir(userDir.c_str()))
@@ -196,3 +171,9 @@ std::string ResourceManager::resolvePath(const std::string& path)
}
return fullPath;
}
std::string ResourceManager::getBaseDir()
{
return PHYSFS_getBaseDir();
}

4
src/framework/core/resourcemanager.h
View File

@@ -31,7 +31,7 @@ public:
void init(const char *argv0);
void terminate();
bool setupWriteDir();
bool setupWriteDir(const std::string& appWriteDirName);
/// Add an package or directory to the search path
bool addToSearchPath(const std::string& path, bool insertInFront = true);
@@ -54,7 +54,7 @@ public:
std::list<std::string> listDirectoryFiles(const std::string& directoryPath = "");
std::string resolvePath(const std::string& path);
std::string getAppUserPath();
std::string getBaseDir();
};
extern ResourceManager g_resources;