X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=df1dac7b45043d99c7c8ff48c3ab2ecfbbb90b1a;hb=bca0a1d2e0c7d05f0dfb1d1c62c85715c63652ba;hp=e8e99a382d2f1b109083b7e94705d0b2e1db2da3;hpb=56814df201c2d86273cf54e0e94c0448ce9bdd0f;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index e8e99a38..df1dac7b 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -262,6 +262,26 @@ static char *getDefaultMusicDir(char *music_subdir)
   return music_dir;
 }
 
+#if 1
+static char *getDefaultArtworkSet(int type)
+{
+  return (type == TREE_TYPE_GRAPHICS_DIR ? "gfx_classic" :
+	  type == TREE_TYPE_SOUNDS_DIR   ? "snd_classic" :
+	  type == TREE_TYPE_MUSIC_DIR    ? "mus_classic" : "");
+}
+
+static char *getDefaultArtworkDir(int type)
+{
+  return (type == TREE_TYPE_GRAPHICS_DIR ?
+	  getDefaultGraphicsDir("gfx_classic") :
+	  type == TREE_TYPE_SOUNDS_DIR ?
+	  getDefaultSoundsDir("snd_classic") :
+	  type == TREE_TYPE_MUSIC_DIR ?
+	  getDefaultMusicDir("mus_classic") : "");
+}
+
+#else
+
 static char *getDefaultArtworkSet(int type)
 {
   return (type == TREE_TYPE_GRAPHICS_DIR ? GFX_CLASSIC_SUBDIR :
@@ -278,6 +298,7 @@ static char *getDefaultArtworkDir(int type)
 	  type == TREE_TYPE_MUSIC_DIR ?
 	  getDefaultMusicDir(MUS_CLASSIC_SUBDIR) : "");
 }
+#endif
 
 static char *getUserGraphicsDir()
 {
@@ -3825,6 +3846,13 @@ void LoadLevelSetup_LastSeries()
   /* always start with reliable default values */
   leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
 
+#if CREATE_SPECIAL_EDITION_RND_JUE
+  leveldir_current = getTreeInfoFromIdentifier(leveldir_first,
+					       "jue_start");
+  if (leveldir_current == NULL)
+    leveldir_current = getFirstValidTreeInfoEntry(leveldir_first);
+#endif
+
   if ((level_setup_hash = loadSetupFileHash(filename)))
   {
     char *last_level_series =