X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=466360035445e37be06ba0efade537367b426d6a;hb=5361c043c5668c9801b4682e0691d34ec428545f;hp=5da89a735d83216a0e8d023ec966ecaa29204d3b;hpb=b59a0eedca464cba38e8a6bcfae54db32ac6b15e;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 5da89a73..46636003 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1180,14 +1180,19 @@ 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_SET	16
+#define SETUP_TOKEN_SOUNDS_SET		17
+#define SETUP_TOKEN_MUSIC_SET		18
 
-#define NUM_GLOBAL_SETUP_TOKENS		15
+#define NUM_GLOBAL_SETUP_TOKENS		19
 
 /* shortcut setup */
 #define SETUP_TOKEN_SAVE_GAME		0
 #define SETUP_TOKEN_LOAD_GAME		1
+#define SETUP_TOKEN_TOGGLE_PAUSE	2
 
-#define NUM_SHORTCUT_SETUP_TOKENS	2
+#define NUM_SHORTCUT_SETUP_TOKENS	3
 
 /* player setup */
 #define SETUP_TOKEN_USE_JOYSTICK	0
@@ -1230,14 +1235,19 @@ 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_set,	"graphics_set"			},
+  { TYPE_STRING, &si.sounds_set,	"sounds_set"			},
+  { TYPE_STRING, &si.music_set,		"music_set"			},
 };
 
 static struct TokenInfo shortcut_setup_tokens[] =
 {
   /* shortcut setup */
   { TYPE_KEY_X11, &ssi.save_game,		"shortcut.save_game"	},
-  { TYPE_KEY_X11, &ssi.load_game,		"shortcut.load_game"	}
+  { TYPE_KEY_X11, &ssi.load_game,		"shortcut.load_game"	},
+  { TYPE_KEY_X11, &ssi.toggle_pause,		"shortcut.toggle_pause"	}
 };
 
 static struct TokenInfo player_setup_tokens[] =
@@ -1283,9 +1293,15 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->handicap = TRUE;
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
+  si->ask_on_escape = TRUE;
+
+  si->graphics_set = getStringCopy(GRAPHICS_SUBDIR);
+  si->sounds_set = getStringCopy(SOUNDS_SUBDIR);
+  si->music_set = getStringCopy(MUSIC_SUBDIR);
 
   si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
+  si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
 
   for (i=0; i<MAX_PLAYERS; i++)
   {
@@ -1409,7 +1425,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_SET - 1)
       fprintf(file, "\n");
   }