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. Fixing some coding mistakes.

Browse Source
This commit is contained in:
WrinklyNinja
2013-08-06 13:23:13 +01:00
parent 5b1233e106
commit ce652994f5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata.cpp
+10 -6
View File
@@ -727,13 +727,13 @@ namespace boss {
std::string key;
std::string value;
//Priority values should override the number of override records as the deciding factor if they differ.
if (it->Priority() < jt->Priority())
if (it->Priority() < jt->Priority()) {
key = jt->Name();
value = it->Name();
else if (jt->Priority() < it->Priority())
} else if (jt->Priority() < it->Priority()) {
key = it->Name();
value = jt->Name();
else if (it->NumOverrideFormIDs() >= jt->NumOverrideFormIDs()) {
} else if (it->NumOverrideFormIDs() >= jt->NumOverrideFormIDs()) {
key = jt->Name();
value = it->Name();
} else {
@@ -757,15 +757,19 @@ namespace boss {
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());
boost::unordered_map< std::string, std::vector<std::string> >::const_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());
for (set<File>::const_iterator it=fileset.begin(), endIt=fileset.end(); it != endIt; ++it) {
inVertices.insert(it->Name());
}
fileset = plugin.LoadAfter();
inVertices.insert(fileset.begin(), fileset.end());
for (set<File>::const_iterator it=fileset.begin(), endIt=fileset.end(); it != endIt; ++it) {
inVertices.insert(it->Name());
}
}