Work in proggress, continuing, no more crashes

diff --git a/main.c b/main.c
index 3349b49708697389469f3416d9157fe244805653..a9e64b162d880c96cf031418fbd75a027ebe768f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -266,7 +266,7 @@ static void loop(SDL_Surface *screen, int num_of_planets, double total_mass,
                }
 
                //itr.limit.x = cam->zoom
-               itr.qt_iterator.head = planet_root;
+               itr.qt_iterator.head = &planet_root->tree;
 
                visible_planets = walk_quadtree(&itr.qt_iterator);
 

diff --git a/quadtree.c b/quadtree.c
index 987dbb686e61927ca59deecc8765de1fe34a1d98..66cdf2847a146f291d95fb40cf288e68847140ae 100644 (file)
--- a/quadtree.c
+++ b/quadtree.c
@@ -212,7 +212,7 @@ static int _walk_tree(struct quadtree *head, const struct quadtree_iterator *it)
 {
        int direction, count = 0;
 
-       direction = it->direction(head, it);
+       direction = it->direction(head, (struct quadtree_iterator *)it);
 
        if ((direction & QUADTREE_UPLEFT) && head->child[0])
                count += _walk_tree(head->child[0], it);
@@ -227,7 +227,7 @@ static int _walk_tree(struct quadtree *head, const struct quadtree_iterator *it)
                count += _walk_tree(head->child[3], it);
 
        if ((direction & QUADTREE_SELF) && it->callback) {
-               it->callback(head, it->ptr);
+               it->callback(head, (struct quadtree_iterator *)it);
                count++;
        }