X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=ebf045cb07aa52367ca0a579bb59051e3690f6e2;hb=2176d1de29652bc9e8db1baa283fdc1c4e99e674;hp=f8b9e8b859c9fe94e2eb09f8a13c2f92e3ddfa31;hpb=61f3e4384807556f36acba1388e4b5535c583c13;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index f8b9e8b8..ebf045cb 100644
--- a/src/files.c
+++ b/src/files.c
@@ -7909,9 +7909,9 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_SKIP_LEVELS			15
 #define SETUP_TOKEN_TIME_LIMIT			16
 #define SETUP_TOKEN_FULLSCREEN			17
-#define SETUP_TOKEN_FULLSCREEN_MODE		18
-#define SETUP_TOKEN_WINDOW_SCALING_PERCENT	19
-#define SETUP_TOKEN_WINDOW_SCALING_QUALITY	20
+#define SETUP_TOKEN_WINDOW_SCALING_PERCENT	18
+#define SETUP_TOKEN_WINDOW_SCALING_QUALITY	19
+#define SETUP_TOKEN_SCREEN_RENDERING_MODE	20
 #define SETUP_TOKEN_ASK_ON_ESCAPE		21
 #define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	22
 #define SETUP_TOKEN_QUICK_SWITCH		23
@@ -8044,8 +8044,10 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_INT_FALLBACK_MUSIC_FILE	12
 #define SETUP_TOKEN_INT_DEFAULT_LEVEL_SERIES	13
 #define SETUP_TOKEN_INT_CHOOSE_FROM_TOP_LEVELDIR 14
+#define SETUP_TOKEN_INT_DEFAULT_WINDOW_WIDTH	15
+#define SETUP_TOKEN_INT_DEFAULT_WINDOW_HEIGHT	16
 
-#define NUM_INTERNAL_SETUP_TOKENS		15
+#define NUM_INTERNAL_SETUP_TOKENS		17
 
 /* options setup */
 #define SETUP_TOKEN_OPTIONS_VERBOSE		0
@@ -8082,9 +8084,9 @@ 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_INTEGER,&si.window_scaling_percent,  "window_scaling_percent"	},
   { TYPE_STRING, &si.window_scaling_quality,  "window_scaling_quality"	},
+  { TYPE_STRING, &si.screen_rendering_mode,   "screen_rendering_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"	},
@@ -8217,6 +8219,8 @@ static struct TokenInfo internal_setup_tokens[] =
   { TYPE_STRING, &sxi.fallback_music_file,	"fallback_music_file"	},
   { TYPE_STRING, &sxi.default_level_series,	"default_level_series"	},
   { TYPE_BOOLEAN,&sxi.choose_from_top_leveldir,	"choose_from_top_leveldir" },
+  { TYPE_INTEGER,&sxi.default_window_width,	"default_window_width"	},
+  { TYPE_INTEGER,&sxi.default_window_height,	"default_window_height"	},
 };
 
 static struct TokenInfo options_setup_tokens[] =
@@ -8262,9 +8266,9 @@ 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->window_scaling_percent = STD_WINDOW_SCALING_PERCENT;
   si->window_scaling_quality = getStringCopy(SCALING_QUALITY_DEFAULT);
+  si->screen_rendering_mode = getStringCopy(STR_SPECIAL_RENDERING_DEFAULT);
   si->ask_on_escape = TRUE;
   si->ask_on_escape_editor = TRUE;
   si->quick_switch = FALSE;
@@ -8379,6 +8383,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET);
   si->internal.choose_from_top_leveldir = FALSE;
 
+  si->internal.default_window_width  = WIN_XSIZE_DEFAULT;
+  si->internal.default_window_height = WIN_YSIZE_DEFAULT;
+
   si->options.verbose = FALSE;
 
 #if defined(PLATFORM_ANDROID)