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

Fix #7

Browse Source
This commit is contained in:
Eduardo Bart
2013-01-26 14:54:19 -02:00
parent 4d0d62e364
commit 6594b2d090
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/framework/core/module.cpp
View File

@@ -46,10 +46,16 @@ bool Module::load()
g_lua.pop();
for(const std::string& depName : m_dependencies) {
if(depName == m_name)
stdext::throw_exception(stdext::format("cannot depend on itself"));
ModulePtr dep = g_modules.getModule(depName);
if(!dep)
stdext::throw_exception(stdext::format("dependency '%s' was not found", depName));
if(dep->hasDependency(m_name, true))
stdext::throw_exception(stdext::format("dependency '%s' is recursively depending on itself", depName));
if(!dep->isLoaded() && !dep->load())
stdext::throw_exception(stdext::format("dependency '%s' has failed to load", depName));
}
@@ -158,10 +164,19 @@ bool Module::isDependent()
return false;
}
bool Module::hasDependency(const std::string& name)
bool Module::hasDependency(const std::string& name, bool recursive)
{
if(std::find(m_dependencies.begin(), m_dependencies.end(), name) != m_dependencies.end())
return true;
if(recursive) {
for(const std::string& depName : m_dependencies) {
ModulePtr dep = g_modules.getModule(depName);
if(dep && dep->hasDependency(name, true))
return true;
}
}
return false;
}

2
src/framework/core/module.h
View File

@@ -44,7 +44,7 @@ public:
bool isReloadable() { return m_reloadable; }
bool isDependent();
bool isSandboxed() { return m_sandboxed; }
bool hasDependency(const std::string& name);
bool hasDependency(const std::string& name, bool recursive = false);
int getSandbox(LuaInterface *lua);
std::string getDescription() { return m_description; }