X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=60ec59f307cc83e9aaf332a86c5b85f16b13e73d;hb=e3eb198296f9af373fa51c7a30f3a9ae27870808;hp=715464ab13da9140fec5b6cc3e29a9aec93f3774;hpb=360dc85deeb6b16c3923f629f3c6909a19823e3e;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 715464ab..60ec59f3 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1290,26 +1290,40 @@ 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;
 
-  if (node->node_group)		// enter level group (step down into tree)
+  if (node->node_group)		// enter node group (step down into tree)
     return getFirstValidTreeInfoEntry(node->node_group);
 
-  if (node->parent_link)	// skip start entry of level group
+  if (node->parent_link)	// skip first node (back link) of node group
+    get_next_node = TRUE;
+
+  if (get_next_node)
   {
-    if (node->next)		// get first real level series entry
-      return getFirstValidTreeInfoEntry(node->next);
-    else			// leave empty level group and go on
-      return getFirstValidTreeInfoEntry(node->node_parent->next);
+    // get next regular tree node, or step up until one is found
+    while (node->next == NULL && node->node_parent != NULL)
+      node = node->node_parent;
+
+    return getFirstValidTreeInfoEntry(node->next);
   }
 
-  // this seems to be a regular level series
+  // this is a regular tree 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)