Merge branch 'master' of git.ucc.asn.au:ipdf/code

[ipdf/code.git] / src / document.cpp

diff --git a/src/document.cpp b/src/document.cpp
index ffe3b8a..f8a1796 100644 (file)
--- 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)
@@ -439,12 +441,15 @@ unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index
                        m_quadtree.nodes[new_qti].next_overlay = overlay;
                        new_qti = overlay;
                }
-done:
+done: // matches is not amused, but sulix is nice and moved it inside the #ifdef for him.
                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)