]> git.itanic.dy.fi Git - sdl-planets/blobdiff - planet.c
merge_planets: Remove planet from linked lists before merging
[sdl-planets] / planet.c
index 2c7d1435ff09fe8df676735e29f4ba2c3fe445d5..c6d8aeef956ad21adf3da8cb94b90ee64e68016f 100644 (file)
--- a/planet.c
+++ b/planet.c
@@ -266,11 +266,11 @@ static struct planet *_merge_planets(struct planet *a, struct planet *b)
 struct planet *merge_planets(struct planet *a, struct planet *b)
 {
        struct quadtree *p;
-       _merge_planets(a, b);
 
        list_del(&b->list);
        p = quadtree_del(&b->tree, &planet_ops);
 
+       _merge_planets(a, b);
        free(b);
        return tree_to_planet(p);
 }