X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=1895911f1bdfe399c9f10eeab514dcff4732d88e;hb=858a85b2d95c4d45eba19591abb1e3110fb4edc6;hp=315c615f28b41395bb9e89b779f0b0ef587832d4;hpb=42f2880cf77f775665ed25badf639e963a6dbdbf;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 315c615f..1895911f 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -49,6 +49,16 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] =
 
 #define MAX_COOKIE_LEN				256
 
+#define TREE_NODE_TYPE_DEFAULT			0
+#define TREE_NODE_TYPE_PARENT			1
+#define TREE_NODE_TYPE_GROUP			2
+#define TREE_NODE_TYPE_COPY			3
+
+#define TREE_NODE_TYPE(ti)	(ti->node_group  ? TREE_NODE_TYPE_GROUP  : \
+				 ti->parent_link ? TREE_NODE_TYPE_PARENT : \
+				 ti->is_copy     ? TREE_NODE_TYPE_COPY   : \
+				 TREE_NODE_TYPE_DEFAULT)
+
 
 static void setTreeInfoToDefaults(TreeInfo *, int);
 static TreeInfo *getTreeInfoCopy(TreeInfo *ti);
@@ -1154,7 +1164,21 @@ int numTreeInfo(TreeInfo *node)
 
 boolean validLevelSeries(TreeInfo *node)
 {
-  return (node != NULL && !node->node_group && !node->parent_link);
+  // in a number of cases, tree node is no valid level set
+  if (node == NULL || node->node_group || node->parent_link || node->is_copy)
+    return FALSE;
+
+  return TRUE;
+}
+
+TreeInfo *getValidLevelSeries(TreeInfo *node, TreeInfo *default_node)
+{
+  if (validLevelSeries(node))
+    return node;
+  else if (node->is_copy)
+    return getTreeInfoFromIdentifier(leveldir_first, node->identifier);
+  else
+    return getFirstValidTreeInfoEntry(default_node);
 }
 
 TreeInfo *getFirstValidTreeInfoEntry(TreeInfo *node)
@@ -1226,29 +1250,25 @@ TreeInfo *getTreeInfoFromPos(TreeInfo *node, int pos)
 }
 
 static TreeInfo *getTreeInfoFromIdentifierExt(TreeInfo *node, char *identifier,
-					      boolean include_node_groups)
+					      int node_type_wanted)
 {
   if (identifier == NULL)
     return NULL;
 
   while (node)
   {
+    if (TREE_NODE_TYPE(node) == node_type_wanted &&
+	strEqual(identifier, node->identifier))
+      return node;
+
     if (node->node_group)
     {
-      if (include_node_groups && strEqual(identifier, node->identifier))
-	return node;
-
       TreeInfo *node_group = getTreeInfoFromIdentifierExt(node->node_group,
 							  identifier,
-							  include_node_groups);
+							  node_type_wanted);
       if (node_group)
 	return node_group;
     }
-    else if (!node->parent_link)
-    {
-      if (strEqual(identifier, node->identifier))
-	return node;
-    }
 
     node = node->next;
   }
@@ -1258,7 +1278,7 @@ static TreeInfo *getTreeInfoFromIdentifierExt(TreeInfo *node, char *identifier,
 
 TreeInfo *getTreeInfoFromIdentifier(TreeInfo *node, char *identifier)
 {
-  return getTreeInfoFromIdentifierExt(node, identifier, FALSE);
+  return getTreeInfoFromIdentifierExt(node, identifier, TREE_NODE_TYPE_DEFAULT);
 }
 
 static TreeInfo *cloneTreeNode(TreeInfo **node_top, TreeInfo *node_parent,
@@ -2520,6 +2540,7 @@ static void setTreeInfoToDefaults(TreeInfo *ti, int type)
   ti->sort_priority = LEVELCLASS_UNDEFINED;	// default: least priority
   ti->latest_engine = FALSE;			// default: get from level
   ti->parent_link = FALSE;
+  ti->is_copy = FALSE;
   ti->in_user_dir = FALSE;
   ti->user_defined = FALSE;
   ti->color = 0;
@@ -2601,6 +2622,7 @@ static void setTreeInfoToDefaultsFromParent(TreeInfo *ti, TreeInfo *parent)
   ti->sort_priority = parent->sort_priority;
   ti->latest_engine = parent->latest_engine;
   ti->parent_link = FALSE;
+  ti->is_copy = FALSE;
   ti->in_user_dir = parent->in_user_dir;
   ti->user_defined = parent->user_defined;
   ti->color = parent->color;
@@ -2701,6 +2723,7 @@ static TreeInfo *getTreeInfoCopy(TreeInfo *ti)
 
   ti_copy->level_group		= ti->level_group;
   ti_copy->parent_link		= ti->parent_link;
+  ti_copy->is_copy		= ti->is_copy;
   ti_copy->in_user_dir		= ti->in_user_dir;
   ti_copy->user_defined		= ti->user_defined;
   ti_copy->readonly		= ti->readonly;
@@ -4539,7 +4562,7 @@ void UpdateLastPlayedLevels_TreeInfo(void)
 
   leveldir_last = getTreeInfoFromIdentifierExt(leveldir_first,
 					       TOKEN_STR_LAST_LEVEL_SERIES,
-					       TRUE);
+					       TREE_NODE_TYPE_GROUP);
   if (leveldir_last == NULL)
     return;
 
@@ -4547,16 +4570,22 @@ void UpdateLastPlayedLevels_TreeInfo(void)
 
   freeTreeInfo(*node_new);
 
+  *node_new = NULL;
+
   for (i = 0; last_level_series[i] != NULL; i++)
   {
     LevelDirTree *node_last = getTreeInfoFromIdentifier(leveldir_first,
 							last_level_series[i]);
+    if (node_last == NULL)
+      continue;
 
     *node_new = getTreeInfoCopy(node_last);	// copy complete node
 
     (*node_new)->node_top = &leveldir_first;	// correct top node link
     (*node_new)->node_parent = leveldir_last;	// correct parent node link
 
+    (*node_new)->is_copy = TRUE;		// mark entry as node copy
+
     (*node_new)->node_group = NULL;
     (*node_new)->next = NULL;