X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=60ec59f307cc83e9aaf332a86c5b85f16b13e73d;hp=403d0dae558baa641d5ebf618fb45a8e514fe9c3;hb=e3eb198296f9af373fa51c7a30f3a9ae27870808;hpb=8d2e9e21529dc319434b41ef95ecc6364c806fb5 diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 403d0dae..60ec59f3 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -1290,7 +1290,7 @@ TreeInfo *getValidLevelSeries(TreeInfo *node, TreeInfo *default_node) return getFirstValidTreeInfoEntry(default_node); } -TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node) +static TreeInfo *getValidTreeInfoEntryExt(TreeInfo *node, boolean get_next_node) { if (node == NULL) return NULL; @@ -1299,6 +1299,9 @@ TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node) return getFirstValidTreeInfoEntry(node->node_group); if (node->parent_link) // skip first node (back link) of node group + get_next_node = TRUE; + + if (get_next_node) { // get next regular tree node, or step up until one is found while (node->next == NULL && node->node_parent != NULL) @@ -1311,6 +1314,16 @@ TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node) return node; } +TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node) +{ + return getValidTreeInfoEntryExt(node, FALSE); +} + +TreeInfo *getNextValidTreeInfoEntry(TreeInfo *node) +{ + return getValidTreeInfoEntryExt(node, TRUE); +} + TreeInfo *getTreeInfoFirstGroupEntry(TreeInfo *node) { if (node == NULL)