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

Fixed overlap edges not being added to graph.

Browse Source 
That line got removed accidentally in
1d29628bde.
This commit is contained in:
WrinklyNinja
2014-08-19 22:31:52 +01:00
parent 92da88d99a
commit 66b34f1153
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/graph.cpp
+2 -2
View File
@@ -289,8 +289,6 @@ namespace loot {
//Vertices are the same or are already linked.
continue;
BOOST_LOG_TRIVIAL(trace) << "Checking edge validity between \"" << graph[*vit].Name() << "\" and \"" << graph[*vit2].Name() << "\".";
if (graph[*vit].DoFormIDsOverlap(graph[*vit2])) {
vertex_t vertex, parentVertex;
if (graph[*vit].NumOverrideFormIDs() > graph[*vit2].NumOverrideFormIDs()) {
@@ -310,6 +308,7 @@ namespace loot {
vertex = *vit;
}
BOOST_LOG_TRIVIAL(trace) << "Checking edge validity between \"" << graph[*vit].Name() << "\" and \"" << graph[*vit2].Name() << "\".";
if (!EdgeCreatesCycle(graph, parentVertex, vertex)) { //No edge going the other way, OK to add this edge.
BOOST_LOG_TRIVIAL(trace) << "Adding edge from \"" << graph[parentVertex].Name() << "\" to \"" << graph[vertex].Name() << "\".";
@@ -332,6 +331,7 @@ namespace loot {
AddPriorityEdges(graph);
BOOST_LOG_TRIVIAL(debug) << "Adding overlap edges.";
AddOverlapEdges(graph);
BOOST_LOG_TRIVIAL(info) << "Checking to see if the graph is cyclic.";
CheckForCycles(graph);