loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Issue #39. Added function to get all a plugin's in-vertices.

Browse Source 
Also implemented priority override of overlap-based edge direction.
This commit is contained in:
WrinklyNinja
2013-08-06 12:51:29 +01:00
parent f1c026d3c0
commit 5b1233e106
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata.cpp
+27 -17
View File
@@ -705,22 +705,6 @@ namespace boss {
return boost::ilexicographical_compare(lhs.Name(), rhs.Name());
}
bool load_order_sort(const Plugin& lhs, const Plugin& rhs) {
if (lhs.MustLoadAfter(rhs))
return false;
if (lhs.Priority() < rhs.Priority())
return true;
if (lhs.Priority() > rhs.Priority())
return false;
if (!lhs.OverlapFormIDs(rhs).empty() && lhs.OverrideFormIDs().size() != rhs.OverrideFormIDs().size())
return lhs.OverrideFormIDs().size() > rhs.OverrideFormIDs().size();
return boost::ilexicographical_compare(lhs.Name(), rhs.Name());
}
bool IsPlugin(const std::string& file) {
if (boost::iends_with(file, ".esp") || boost::iends_with(file, ".esm")
|| boost::iends_with(file, ".esp.ghost") || boost::iends_with(file, ".esm.ghost"))
@@ -742,7 +726,14 @@ namespace boss {
if (it->DoFormIDsOverlap(*jt)) {
std::string key;
std::string value;
if (it->NumOverrideFormIDs() >= jt->NumOverrideFormIDs()) {
//Priority values should override the number of override records as the deciding factor if they differ.
if (it->Priority() < jt->Priority())
key = jt->Name();
value = it->Name();
else if (jt->Priority() < it->Priority())
key = it->Name();
value = jt->Name();
else if (it->NumOverrideFormIDs() >= jt->NumOverrideFormIDs()) {
key = jt->Name();
value = it->Name();
} else {
@@ -759,4 +750,23 @@ namespace boss {
}
}
}
void GetPluginInVertices(const Plugin& plugin, const boost::unordered_map< std::string, std::vector<std::string> >& overlapMap, std::set<std::string>& inVertices) {
//In-vertices are named in the plugin's entry in the overlap map, and in the plugin's requirements, masters and loadAfter members.
vector<string> strVec = plugin.Masters();
inVertices.insert(strVec.begin(), strVec.end());
boost::unordered_map< std::string, std::vector<std::string> >::iterator it = overlapMap.find(plugin.Name());
if (it != overlapMap.end())
inVertices.insert(it->second.begin(), it->second.end());
set<File> fileset = plugin.Reqs();
inVertices.insert(fileset.begin(), fileset.end());
fileset = plugin.LoadAfter();
inVertices.insert(fileset.begin(), fileset.end());
}
}
src/backend/metadata.h
+2 -2
View File
@@ -213,12 +213,12 @@ namespace boss {
bool alpha_sort(const Plugin& lhs, const Plugin& rhs);
bool load_order_sort(const Plugin& lhs, const Plugin& rhs);
bool IsPlugin(const std::string& file);
//The map maps each plugin name to a vector of names of plugins that overlap with it and should load before it.
void CalcPluginOverlaps(const std::list<Plugin>& plugins, boost::unordered_map< std::string, std::vector<std::string> >& overlapMap);
void GetPluginInVertices(const Plugin& plugin, const boost::unordered_map< std::string, std::vector<std::string> >& overlapMap, std::set<std::string>& inVertices);
}
#endif