improved debug output for level or artwork tree info dump

[rocksndiamonds.git] / src / libgame / setup.c

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 2bc46d413a2ebbcbacbfdb9132e4b0212efaa327..5a1b6c7d310f2d00cb07ec954460c9c8c47929fc 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1388,16 +1388,23 @@ static boolean adjustTreeSoundsForEMC(TreeInfo *node)
 
 void dumpTreeInfo(TreeInfo *node, int depth)
 {
+  char bullet_list[] = { '-', '*', 'o' };
   int i;
 
-  Debug("tree", "Dumping TreeInfo:");
+  if (depth == 0)
+    Debug("tree", "Dumping TreeInfo:");
 
   while (node)
   {
-    for (i = 0; i < (depth + 1) * 3; i++)
+    char bullet = bullet_list[depth % ARRAY_SIZE(bullet_list)];
+
+    for (i = 0; i < depth * 2; i++)
       DebugContinued("", " ");
 
-    DebugContinued("tree", "'%s' / '%s'\n", node->identifier, node->name);
+    DebugContinued("tree", "%c '%s' ['%s] [PARENT: '%s'] %s\n",
+                  bullet, node->name, node->identifier,
+                  (node->node_parent ? node->node_parent->identifier : "-"),
+                  (node->node_group ? "[GROUP]" : ""));
 
     /*
     // use for dumping artwork info tree
@@ -4420,7 +4427,7 @@ static void InitLastPlayedLevels_ParentNode(void)
 
   pushTreeInfo(leveldir_top, leveldir_new);
 
-  /* create node to link back to current level directory */
+  // create node to link back to current level directory
   createParentTreeInfoNode(leveldir_new);
 }
 
@@ -4508,7 +4515,7 @@ void LoadLevelSetup_LastSeries(void)
   leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
 
   // start with empty history of last played level sets
-  setup.level_setup.last_level_series[0] = NULL;
+  setString(&setup.level_setup.last_level_series[0], NULL);
 
   if (!strEqual(DEFAULT_LEVELSET, UNDEFINED_LEVELSET))
   {
@@ -4540,11 +4547,11 @@ void LoadLevelSetup_LastSeries(void)
       leveldir_last = getTreeInfoFromIdentifier(leveldir_first,
                                                last_level_series);
       if (leveldir_last != NULL)
-       setup.level_setup.last_level_series[pos++] =
-         getStringCopy(last_level_series);
+       setString(&setup.level_setup.last_level_series[pos++],
+                 last_level_series);
     }
 
-    setup.level_setup.last_level_series[pos] = NULL;
+    setString(&setup.level_setup.last_level_series[pos], NULL);
 
     freeSetupFileHash(level_setup_hash);
   }