bas080
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print missing mod dependencies on server start 

i.e., not only the mod with missing dependencies, but also the missing
dependencies itself. (This already used to be the case before the mod
selection gui was added)

Also, mods with unsatisfied dependencies are no longer reported as
mods that could not be found.
master
Jürgen Doser 2013-02-20 20:06:39 +01:00
parent fc61c8809b
commit 89b88917a8
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/server.cpp
View File

@ -998,18 +998,21 @@ Server::Server(
ModConfiguration modconf(m_path_world); ModConfiguration modconf(m_path_world);
m_mods = modconf.getMods(); m_mods = modconf.getMods();
std::list<ModSpec> unsatisfied_mods = modconf.getUnsatisfiedMods();
// complain about mods with unsatisfied dependencies // complain about mods with unsatisfied dependencies
if(!modconf.isConsistent()) if(!modconf.isConsistent())
{ {
errorstream << "The following mods have unsatisfied dependencies: "; for(std::list<ModSpec>::iterator it = unsatisfied_mods.begin();
std::list<ModSpec> modlist = modconf.getUnsatisfiedMods(); it != unsatisfied_mods.end(); ++it)
for(std::list<ModSpec>::iterator it = modlist.begin();
it != modlist.end(); ++it)
{ {
errorstream << (*it).name << " "; ModSpec mod = *it;
} errorstream << "mod \"" << mod.name << "\" has unsatisfied dependencies: ";
for(std::set<std::string>::iterator dep_it = mod.unsatisfied_depends.begin();
dep_it != mod.unsatisfied_depends.end(); ++dep_it)
errorstream << " \"" << *dep_it << "\"";
errorstream << std::endl; errorstream << std::endl;
} }
}
Settings worldmt_settings; Settings worldmt_settings;
std::string worldmt = m_path_world + DIR_DELIM + "world.mt"; std::string worldmt = m_path_world + DIR_DELIM + "world.mt";
@ -1033,12 +1036,15 @@ Server::Server(
for(std::vector<ModSpec>::iterator it = m_mods.begin(); for(std::vector<ModSpec>::iterator it = m_mods.begin();
it != m_mods.end(); ++it) it != m_mods.end(); ++it)
load_mod_names.erase((*it).name); load_mod_names.erase((*it).name);
for(std::list<ModSpec>::iterator it = unsatisfied_mods.begin();
it != unsatisfied_mods.end(); ++it)
load_mod_names.erase((*it).name);
if(!load_mod_names.empty()) if(!load_mod_names.empty())
{ {
errorstream << "The following mods could not be found:"; errorstream << "The following mods could not be found:";
for(std::set<std::string>::iterator it = load_mod_names.begin(); for(std::set<std::string>::iterator it = load_mod_names.begin();
it != load_mod_names.end(); ++it) it != load_mod_names.end(); ++it)
errorstream << (*it) << " "; errorstream << " \"" << (*it) << "\"";
errorstream << std::endl; errorstream << std::endl;
} }