rnd-20020404-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 5da89a735d83216a0e8d023ec966ecaa29204d3b..e39ba56759eeabca5e2455482130a2b00cb81999 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1180,8 +1180,12 @@ void SaveScore(int level_nr)
 #define SETUP_TOKEN_HANDICAP           12
 #define SETUP_TOKEN_TIME_LIMIT         13
 #define SETUP_TOKEN_FULLSCREEN         14
+#define SETUP_TOKEN_ASK_ON_ESCAPE      15
+#define SETUP_TOKEN_GRAPHICS_DIR       16
+#define SETUP_TOKEN_SOUNDS_DIR         17
+#define SETUP_TOKEN_MUSIC_DIR          18
 
-#define NUM_GLOBAL_SETUP_TOKENS                15
+#define NUM_GLOBAL_SETUP_TOKENS                19
 
 /* shortcut setup */
 #define SETUP_TOKEN_SAVE_GAME          0
@@ -1230,7 +1234,11 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.team_mode,                "team_mode"                     },
   { TYPE_SWITCH, &si.handicap,         "handicap"                      },
   { TYPE_SWITCH, &si.time_limit,       "time_limit"                    },
-  { TYPE_SWITCH, &si.fullscreen,       "fullscreen"                    }
+  { TYPE_SWITCH, &si.fullscreen,       "fullscreen"                    },
+  { TYPE_SWITCH, &si.ask_on_escape,    "ask_on_escape"                 },
+  { TYPE_STRING, &si.graphics_dir,     "graphics_dir"                  },
+  { TYPE_STRING, &si.sounds_dir,       "sounds_dir"                    },
+  { TYPE_STRING, &si.music_dir,                "music_dir"                     },
 };
 
 static struct TokenInfo shortcut_setup_tokens[] =
@@ -1283,6 +1291,11 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->handicap = TRUE;
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
+  si->ask_on_escape = TRUE;
+
+  si->graphics_dir = getStringCopy(GRAPHICS_DIRECTORY);
+  si->sounds_dir = getStringCopy(SOUNDS_DIRECTORY);
+  si->music_dir = getStringCopy(MUSIC_DIRECTORY);
 
   si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
@@ -1409,7 +1422,7 @@ void SaveSetup()
     fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i));
 
     /* just to make things nicer :) */
-    if (i == SETUP_TOKEN_PLAYER_NAME)
+    if (i == SETUP_TOKEN_PLAYER_NAME || i == SETUP_TOKEN_GRAPHICS_DIR - 1)
       fprintf(file, "\n");
   }