X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=9ea1754932adb1371c9d994aca8e8af497411e3a;hb=HEAD;hp=db49f46739e511710e53df7e1ea85059e5cf6f68;hpb=6267de26119fba6395dd7259154f5b9177dab84c;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index db49f467..b419875a 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1713,12 +1713,26 @@ static boolean adjustTreeArtworkForEMC(char **artwork_set_1,
 				       char **artwork_set_2,
 				       char **artwork_set, boolean prefer_2)
 {
+  // do nothing if neither special artwork set 1 nor 2 are defined
+  if (!*artwork_set_1 && !*artwork_set_2)
+    return FALSE;
+
   boolean want_1 = (prefer_2 == FALSE);
   boolean want_2 = (prefer_2 == TRUE);
   boolean has_only_1 = (!*artwork_set && !*artwork_set_2);
   boolean has_only_2 = (!*artwork_set && !*artwork_set_1);
   char *artwork_set_new = NULL;
 
+  // replace missing special artwork 1 or 2 with (optional) standard artwork
+
+  if (!*artwork_set_1)
+    setString(artwork_set_1, *artwork_set);
+
+  if (!*artwork_set_2)
+    setString(artwork_set_2, *artwork_set);
+
+  // set standard artwork to either special artwork 1 or 2, as requested
+
   if (*artwork_set_1 && (want_1 || has_only_1))
     artwork_set_new = *artwork_set_1;
 
@@ -4580,6 +4594,12 @@ static boolean AddTreeSetToTreeInfoExt(TreeInfo *tree_node_old, char *tree_dir,
   TreeInfo *tree_node_new = getTreeInfoFromIdentifier(*tree_node_first,
 						      tree_subdir_new);
 
+  // if not found, check if added node is level group or artwork group
+  if (tree_node_new == NULL)
+    tree_node_new = getTreeInfoFromIdentifierExt(*tree_node_first,
+						 tree_subdir_new,
+						 TREE_NODE_TYPE_GROUP);
+
   if (tree_node_new == NULL)		// should not happen
     return FALSE;