BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add support back for resolving group names in NodeResolver

Browse Source
This commit is contained in:
kwolekr 2014-12-29 23:15:53 -05:00
parent f12118c38b
commit c6df2bc42c
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nodedef.cpp
View File

@ -1356,13 +1356,21 @@ bool CNodeDefManager::getIdsFromResolveInfo(NodeResolveInfo *nri,
std::string name = nri->nodenames.front(); std::string name = nri->nodenames.front();
nri->nodenames.pop_front(); nri->nodenames.pop_front();
if (getId(name, c)) { if (name.substr(0,6) != "group:") {
result.push_back(c); if (getId(name, c)) {
} else if (listinfo.all_required) { result.push_back(c);
errorstream << "Resolver: Failed to resolve node name '" << name } else if (listinfo.all_required) {
<< "'." << std::endl; errorstream << "Resolver: Failed to resolve node name '" << name
result.push_back(listinfo.c_fallback); << "'." << std::endl;
success = false; result.push_back(listinfo.c_fallback);
success = false;
}
} else {
std::set<content_t> cids;
std::set<content_t>::iterator it;
getIds(name, cids);
for (it = cids.begin(); it != cids.end(); ++it)
result.push_back(*it);
} }
} }