rnd-20071001-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index e78c1cdb271102049a81b6c596a7bab2bcfbe854..3b51e6e28b92236f2126c769e29d3f78f924735a 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8013,7 +8013,7 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS    28
 #define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS      29
 #define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC       30
-#define SETUP_TOKEN_OVERRIDE_CLASSIC_ARTWORK   31
+#define SETUP_TOKEN_AUTO_OVERRIDE_ARTWORK      31
 
 #define NUM_GLOBAL_SETUP_TOKENS                        32
 
@@ -8143,7 +8143,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.override_level_graphics, "override_level_graphics"        },
   { TYPE_SWITCH, &si.override_level_sounds,   "override_level_sounds"  },
   { TYPE_SWITCH, &si.override_level_music,    "override_level_music"   },
-  { TYPE_SWITCH, &si.override_classic_artwork,"override_classic_artwork"},
+  { TYPE_SWITCH, &si.auto_override_artwork,   "auto_override_artwork"  },
 };
 
 static boolean not_used = FALSE;
@@ -8292,13 +8292,13 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->prefer_aga_graphics = TRUE;
   si->game_frame_delay = GAME_FRAME_DELAY;
 
-  si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
-  si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
-  si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR);
+  si->graphics_set = getStringCopy(GFX_DEFAULT_SUBDIR);
+  si->sounds_set = getStringCopy(SND_DEFAULT_SUBDIR);
+  si->music_set = getStringCopy(MUS_DEFAULT_SUBDIR);
   si->override_level_graphics = FALSE;
   si->override_level_sounds = FALSE;
   si->override_level_music = FALSE;
-  si->override_classic_artwork = FALSE;
+  si->auto_override_artwork = FALSE;
 
   si->editor.el_boulderdash            = TRUE;
   si->editor.el_emerald_mine           = TRUE;
@@ -8353,6 +8353,12 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
 
   si->options.verbose = FALSE;
+
+#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
+  si->handicap = FALSE;
+  si->fullscreen = TRUE;
+  si->auto_override_artwork = TRUE;
+#endif
 }
 
 static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)