X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=0185e4f602f5125c00e4e6e3c263fe9b270857ce;hb=18f04ed2930c70cce6231148945cc24a1c662041;hp=8d299b6740cf134221914242269c045ab7e9ed01;hpb=bc76bd63993e350f699d1420ebd9ae3ac573f407;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 8d299b67..0185e4f6 100644
--- a/src/files.c
+++ b/src/files.c
@@ -6853,19 +6853,20 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_SKIP_LEVELS			14
 #define SETUP_TOKEN_TIME_LIMIT			15
 #define SETUP_TOKEN_FULLSCREEN			16
-#define SETUP_TOKEN_ASK_ON_ESCAPE		17
-#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	18
-#define SETUP_TOKEN_QUICK_SWITCH		19
-#define SETUP_TOKEN_INPUT_ON_FOCUS		20
-#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		21
-#define SETUP_TOKEN_GRAPHICS_SET		22
-#define SETUP_TOKEN_SOUNDS_SET			23
-#define SETUP_TOKEN_MUSIC_SET			24
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	25
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	26
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	27
-
-#define NUM_GLOBAL_SETUP_TOKENS			28
+#define SETUP_TOKEN_FULLSCREEN_MODE		17
+#define SETUP_TOKEN_ASK_ON_ESCAPE		18
+#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	19
+#define SETUP_TOKEN_QUICK_SWITCH		20
+#define SETUP_TOKEN_INPUT_ON_FOCUS		21
+#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		22
+#define SETUP_TOKEN_GRAPHICS_SET		23
+#define SETUP_TOKEN_SOUNDS_SET			24
+#define SETUP_TOKEN_MUSIC_SET			25
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	26
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	27
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	28
+
+#define NUM_GLOBAL_SETUP_TOKENS			29
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -6976,6 +6977,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.skip_levels,	"skip_levels"			},
   { TYPE_SWITCH, &si.time_limit,	"time_limit"			},
   { TYPE_SWITCH, &si.fullscreen,	"fullscreen"			},
+  { TYPE_STRING, &si.fullscreen_mode,	"fullscreen_mode"		},
   { TYPE_SWITCH, &si.ask_on_escape,	"ask_on_escape"			},
   { TYPE_SWITCH, &si.ask_on_escape_editor, "ask_on_escape_editor"	},
   { TYPE_SWITCH, &si.quick_switch,	"quick_player_switch"		},
@@ -6989,8 +6991,19 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.override_level_music,    "override_level_music"	},
 };
 
+static boolean not_used = FALSE;
 static struct TokenInfo editor_setup_tokens[] =
 {
+#if 1
+  { TYPE_SWITCH, &not_used,		"editor.el_boulderdash"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_emerald_mine"	},
+  { TYPE_SWITCH, &not_used,		"editor.el_emerald_mine_club"	},
+  { TYPE_SWITCH, &not_used,		"editor.el_more"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_sokoban"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_supaplex"		},
+  { TYPE_SWITCH, &not_used,		"editor.el_diamond_caves"	},
+  { TYPE_SWITCH, &not_used,		"editor.el_dx_boulderdash"	},
+#else
   { TYPE_SWITCH, &sei.el_boulderdash,	"editor.el_boulderdash"		},
   { TYPE_SWITCH, &sei.el_emerald_mine,	"editor.el_emerald_mine"	},
   { TYPE_SWITCH, &sei.el_emerald_mine_club,"editor.el_emerald_mine_club"},
@@ -6999,9 +7012,14 @@ static struct TokenInfo editor_setup_tokens[] =
   { TYPE_SWITCH, &sei.el_supaplex,	"editor.el_supaplex"		},
   { TYPE_SWITCH, &sei.el_diamond_caves,	"editor.el_diamond_caves"	},
   { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash"	},
+#endif
   { TYPE_SWITCH, &sei.el_chars,		"editor.el_chars"		},
   { TYPE_SWITCH, &sei.el_custom,	"editor.el_custom"		},
+#if 1
+  { TYPE_SWITCH, &not_used,		"editor.el_headlines"		},
+#else
   { TYPE_SWITCH, &sei.el_headlines,	"editor.el_headlines"		},
+#endif
   { TYPE_SWITCH, &sei.el_user_defined,	"editor.el_user_defined"	},
   { TYPE_SWITCH, &sei.el_dynamic,	"editor.el_dynamic"		},
   { TYPE_SWITCH, &sei.el_by_game,	"editor.el_by_game"		},
@@ -7109,6 +7127,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->skip_levels = TRUE;
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
+  si->fullscreen_mode = getStringCopy(DEFAULT_FULLSCREEN_MODE);
   si->ask_on_escape = TRUE;
   si->ask_on_escape_editor = TRUE;
   si->quick_switch = FALSE;