#define SETUP_TOKEN_TIME_LIMIT 16
#define SETUP_TOKEN_FULLSCREEN 17
#define SETUP_TOKEN_FULLSCREEN_MODE 18
-#define SETUP_TOKEN_ASK_ON_ESCAPE 19
-#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 20
-#define SETUP_TOKEN_QUICK_SWITCH 21
-#define SETUP_TOKEN_INPUT_ON_FOCUS 22
-#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 23
-#define SETUP_TOKEN_GAME_FRAME_DELAY 24
-#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS 25
-#define SETUP_TOKEN_SMALL_GAME_GRAPHICS 26
-#define SETUP_TOKEN_GRAPHICS_SET 27
-#define SETUP_TOKEN_SOUNDS_SET 28
-#define SETUP_TOKEN_MUSIC_SET 29
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 30
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 31
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 32
-#define SETUP_TOKEN_VOLUME_SIMPLE 33
-#define SETUP_TOKEN_VOLUME_LOOPS 34
-#define SETUP_TOKEN_VOLUME_MUSIC 35
-
-#define NUM_GLOBAL_SETUP_TOKENS 36
+#define SETUP_TOKEN_WINDOW_SCALING_PERCENT 19
+#define SETUP_TOKEN_WINDOW_SCALING_QUALITY 20
+#define SETUP_TOKEN_ASK_ON_ESCAPE 21
+#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 22
+#define SETUP_TOKEN_QUICK_SWITCH 23
+#define SETUP_TOKEN_INPUT_ON_FOCUS 24
+#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 25
+#define SETUP_TOKEN_GAME_FRAME_DELAY 26
+#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS 27
+#define SETUP_TOKEN_SMALL_GAME_GRAPHICS 28
+#define SETUP_TOKEN_GRAPHICS_SET 29
+#define SETUP_TOKEN_SOUNDS_SET 30
+#define SETUP_TOKEN_MUSIC_SET 31
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 32
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 33
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 34
+#define SETUP_TOKEN_VOLUME_SIMPLE 35
+#define SETUP_TOKEN_VOLUME_LOOPS 36
+#define SETUP_TOKEN_VOLUME_MUSIC 37
+
+#define NUM_GLOBAL_SETUP_TOKENS 38
/* editor setup */
#define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0
{ 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_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" },
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->ask_on_escape = TRUE;
si->ask_on_escape_editor = TRUE;
si->quick_switch = FALSE;
si->override_level_sounds = AUTO;
si->override_level_music = AUTO;
#endif
+
+#if defined(PLATFORM_ANDROID)
+ si->fullscreen = TRUE;
+#endif
}
static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)