X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=c64c95c8ee84c6d5fdb17d6b110eaded193a01a7;hp=eec6cb5a6ca1f6b5d187037bc32dcf35ebc172e5;hb=7270af24b41bc33fbb89a97227a7696e343eacbb;hpb=f11d2545f41637e871283f7624dccc8243d05138

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index eec6cb5a..c64c95c8 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -178,7 +178,7 @@ static char *getNetworkDir(void)
   return network_dir;
 }
 
-static char *getLevelDirFromTreeInfo(TreeInfo *node)
+char *getLevelDirFromTreeInfo(TreeInfo *node)
 {
   static char *level_dir = NULL;
 
@@ -3118,28 +3118,37 @@ static boolean CheckZipFileForDirectory(char *zip_filename, char *directory,
   return TRUE;
 }
 
-boolean ExtractZipFileIntoDirectory(char *zip_filename, char *directory,
-				    int tree_type)
+char *ExtractZipFileIntoDirectory(char *zip_filename, char *directory,
+				  int tree_type)
 {
   boolean zip_file_valid = CheckZipFileForDirectory(zip_filename, directory,
 						    tree_type);
 
-  Error(ERR_DEBUG, "zip file '%s': %s", zip_filename,
-	(zip_file_valid ? "EXTRACT" : "REJECT"));
-
   if (!zip_file_valid)
-    return FALSE;
+  {
+    Error(ERR_WARN, "zip file '%s' rejected!", zip_filename);
+
+    return NULL;
+  }
 
   char **zip_entries = zip_extract(zip_filename, directory);
 
-  boolean zip_file_extracted = (zip_entries != NULL);
+  if (zip_entries == NULL)
+  {
+    Error(ERR_WARN, "zip file '%s' could not be extracted!", zip_filename);
 
-  if (zip_file_extracted)
-    Error(ERR_DEBUG, "zip file successfully extracted!");
-  else
-    Error(ERR_DEBUG, "zip file could not be extracted!");
+    return NULL;
+  }
+
+  Error(ERR_INFO, "zip file '%s' successfully extracted!", zip_filename);
+
+  // first zip file entry contains top level directory
+  char *top_dir = zip_entries[0];
 
-  return zip_file_extracted;
+  // remove trailing directory separator from top level directory
+  top_dir[strlen(top_dir) - 1] = '\0';
+
+  return top_dir;
 }
 
 static void ProcessZipFilesInDirectory(char *directory, int tree_type)
@@ -3171,10 +3180,9 @@ static void ProcessZipFilesInDirectory(char *directory, int tree_type)
     if (!fileExists(zip_filename_extracted) &&
 	!fileExists(zip_filename_rejected))
     {
-      boolean zip_file_extracted = ExtractZipFileIntoDirectory(zip_filename,
-							       directory,
-							       tree_type);
-      char *marker_filename = (zip_file_extracted ? zip_filename_extracted :
+      char *top_dir = ExtractZipFileIntoDirectory(zip_filename, directory,
+						  tree_type);
+      char *marker_filename = (top_dir != NULL ? zip_filename_extracted :
 			       zip_filename_rejected);
       FILE *marker_file;
 
@@ -3852,13 +3860,29 @@ void LoadLevelArtworkInfo(void)
   print_timestamp_done("LoadLevelArtworkInfo");
 }
 
-static boolean AddUserLevelSetToLevelInfoExt(char *level_subdir_new)
+static boolean AddTreeSetToTreeInfoExt(TreeInfo *tree_node_old, char *tree_dir,
+				       char *tree_subdir_new, int type)
 {
-  // get level info tree node of first (original) user level set
-  char *level_subdir_old = getLoginName();
-  LevelDirTree *leveldir_old = getTreeInfoFromIdentifier(leveldir_first,
-							 level_subdir_old);
-  if (leveldir_old == NULL)		// should not happen
+  if (tree_node_old == NULL)
+  {
+    if (type == TREE_TYPE_LEVEL_DIR)
+    {
+      // get level info tree node of personal user level set
+      tree_node_old = getTreeInfoFromIdentifier(leveldir_first, getLoginName());
+    }
+    else
+    {
+      // get artwork info tree node of first artwork set
+      tree_node_old = ARTWORK_FIRST_NODE(artwork, type);
+    }
+  }
+
+  if (tree_dir == NULL)
+    tree_dir = TREE_USERDIR(type);
+
+  if (tree_node_old   == NULL ||
+      tree_dir        == NULL ||
+      tree_subdir_new == NULL)		// should not happen
     return FALSE;
 
   int draw_deactivation_mask = GetDrawDeactivationMask();
@@ -3866,33 +3890,54 @@ static boolean AddUserLevelSetToLevelInfoExt(char *level_subdir_new)
   // override draw deactivation mask (temporarily disable drawing)
   SetDrawDeactivationMask(REDRAW_ALL);
 
-  // load new level set config and add it next to first user level set
-  LoadLevelInfoFromLevelConf(&leveldir_old->next, NULL,
-			     leveldir_old->basepath, level_subdir_new);
+  if (type == TREE_TYPE_LEVEL_DIR)
+  {
+    // load new level set config and add it next to first user level set
+    LoadLevelInfoFromLevelConf(&tree_node_old->next,
+			       tree_node_old->node_parent,
+			       tree_dir, tree_subdir_new);
+  }
+  else
+  {
+    // load new artwork set config and add it next to first artwork set
+    LoadArtworkInfoFromArtworkConf(&tree_node_old->next,
+				   tree_node_old->node_parent,
+				   tree_dir, tree_subdir_new, type);
+  }
 
   // set draw deactivation mask to previous value
   SetDrawDeactivationMask(draw_deactivation_mask);
 
-  // get level info tree node of newly added user level set
-  LevelDirTree *leveldir_new = getTreeInfoFromIdentifier(leveldir_first,
-							 level_subdir_new);
-  if (leveldir_new == NULL)		// should not happen
+  // get first node of level or artwork info tree
+  TreeInfo **tree_node_first = TREE_FIRST_NODE_PTR(type);
+
+  // get tree info node of newly added level or artwork set
+  TreeInfo *tree_node_new = getTreeInfoFromIdentifier(*tree_node_first,
+						      tree_subdir_new);
+
+  if (tree_node_new == NULL)		// should not happen
     return FALSE;
 
   // correct top link and parent node link of newly created tree node
-  leveldir_new->node_top    = leveldir_old->node_top;
-  leveldir_new->node_parent = leveldir_old->node_parent;
+  tree_node_new->node_top    = tree_node_old->node_top;
+  tree_node_new->node_parent = tree_node_old->node_parent;
 
-  // sort level info tree to adjust position of newly added level set
-  sortTreeInfo(&leveldir_first);
+  // sort tree info to adjust position of newly added tree set
+  sortTreeInfo(tree_node_first);
 
   return TRUE;
 }
 
+void AddTreeSetToTreeInfo(TreeInfo *tree_node, char *tree_dir,
+			  char *tree_subdir_new, int type)
+{
+  if (!AddTreeSetToTreeInfoExt(tree_node, tree_dir, tree_subdir_new, type))
+    Error(ERR_EXIT, "internal tree info structure corrupted -- aborting");
+}
+
 void AddUserLevelSetToLevelInfo(char *level_subdir_new)
 {
-  if (!AddUserLevelSetToLevelInfoExt(level_subdir_new))
-    Error(ERR_EXIT, "internal level set structure corrupted -- aborting");
+  AddTreeSetToTreeInfo(NULL, NULL, level_subdir_new, TREE_TYPE_LEVEL_DIR);
 }
 
 char *getArtworkIdentifierForUserLevelSet(int type)
@@ -4291,6 +4336,11 @@ static void checkSeriesInfo(void)
 {
   static char *level_directory = NULL;
   Directory *dir;
+#if 0
+  DirectoryEntry *dir_entry;
+#endif
+
+  checked_free(level_directory);
 
   // check for more levels besides the 'levels' field of 'levelinfo.conf'
 
@@ -4306,6 +4356,35 @@ static void checkSeriesInfo(void)
     return;
   }
 
+#if 0
+  while ((dir_entry = readDirectory(dir)) != NULL)	// loop all entries
+  {
+    if (strlen(dir_entry->basename) > 4 &&
+	dir_entry->basename[3] == '.' &&
+	strEqual(&dir_entry->basename[4], LEVELFILE_EXTENSION))
+    {
+      char levelnum_str[4];
+      int levelnum_value;
+
+      strncpy(levelnum_str, dir_entry->basename, 3);
+      levelnum_str[3] = '\0';
+
+      levelnum_value = atoi(levelnum_str);
+
+      if (levelnum_value < leveldir_current->first_level)
+      {
+	Error(ERR_WARN, "additional level %d found", levelnum_value);
+	leveldir_current->first_level = levelnum_value;
+      }
+      else if (levelnum_value > leveldir_current->last_level)
+      {
+	Error(ERR_WARN, "additional level %d found", levelnum_value);
+	leveldir_current->last_level = levelnum_value;
+      }
+    }
+  }
+#endif
+
   closeDirectory(dir);
 }