X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=f8a17964cd24b1b5173e733d1207ed5d14efd99f;hp=6e022dfbd176796e7852679690b43b8eaaa29654;hb=c4f8f7c6c7e43fc9fd5358197ca866b4186f636c;hpb=a54254dcb23c8db9b78d5bd42e1ca54efda4c8e8

diff --git a/src/document.cpp b/src/document.cpp
index 6e022df..f8a1796 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -225,16 +225,16 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare
 	switch (type)
 	{
 		case QTC_TOP_LEFT:
-			orig_node = m_quadtree.nodes[orig_parent].top_left = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].top_left;
 			break;
 		case QTC_TOP_RIGHT:
-			orig_node = m_quadtree.nodes[orig_parent].top_right = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].top_right;
 			break;
 		case QTC_BOTTOM_LEFT:
-			orig_node = m_quadtree.nodes[orig_parent].bottom_left = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].bottom_left;
 			break;
 		case QTC_BOTTOM_RIGHT:
-			orig_node = m_quadtree.nodes[orig_parent].bottom_right = new_index;
+			orig_node = m_quadtree.nodes[orig_parent].bottom_right;
 			break;
 		default:
 			Fatal("Tried to overlay a QuadTree child of invalid type!");
@@ -244,7 +244,8 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare
 
 	// Add us to the node's overlay linked list.
 	QuadTreeIndex prev_overlay = orig_node;
-	while (m_quadtree.nodes[prev_overlay].next_overlay != -1);
+	while (m_quadtree.nodes[prev_overlay].next_overlay != -1) prev_overlay = m_quadtree.nodes[prev_overlay].next_overlay;
+	Debug("- Original node %d, Previous overlay %d, new overlay %d", orig_node, prev_overlay, new_index);
 	m_quadtree.nodes[prev_overlay].next_overlay = new_index;
 
 	// Recurse into any extant children.
@@ -258,6 +259,7 @@ void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex pare
 		OverlayQuadChildren(orig_node, new_index, QTC_BOTTOM_RIGHT);
 
 	m_quadtree.nodes[new_index].object_dirty = m_quadtree.nodes[new_index].object_end;
+	m_quadtree.nodes[new_index].next_overlay = -1;
 }
 
 void Document::PropagateQuadChanges(QuadTreeIndex node)
@@ -443,8 +445,11 @@ done: // matches is not amused, but sulix is nice and moved it inside the #ifdef
 		m_count++;
 		PropagateQuadChanges(qti);
 	}
+	return m_count;
+#else // words fail me (still not amused)
+	return (m_count++);
 #endif
-	return m_count; // Why can't we just use the size of types or something?
+	
 }
 
 unsigned Document::AddBezierData(const Bezier & bezier)