X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=64e204c2bde1ee6ccf13e6cd30226421619af1d1;hb=610e1570ca2492a97cfc5cf6a3794c07b605df48;hp=cde497414e766ddec9ca5b242e16eb3a295ce843;hpb=36cfa0205e5a618c59e2e24c1c6650597a59ddca;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index cde49741..64e204c2 100644 --- a/src/files.c +++ b/src/files.c @@ -11346,25 +11346,26 @@ void SaveScore(int nr) #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_ASK_ON_ESCAPE 20 +#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 21 +#define SETUP_TOKEN_QUICK_SWITCH 22 +#define SETUP_TOKEN_INPUT_ON_FOCUS 23 +#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 24 +#define SETUP_TOKEN_GAME_FRAME_DELAY 25 +#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS 26 +#define SETUP_TOKEN_SMALL_GAME_GRAPHICS 27 +#define SETUP_TOKEN_GRAPHICS_SET 28 +#define SETUP_TOKEN_SOUNDS_SET 29 +#define SETUP_TOKEN_MUSIC_SET 30 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 31 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 32 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 33 +#define SETUP_TOKEN_VOLUME_SIMPLE 34 +#define SETUP_TOKEN_VOLUME_LOOPS 35 +#define SETUP_TOKEN_VOLUME_MUSIC 36 + +#define NUM_GLOBAL_SETUP_TOKENS 37 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -11493,6 +11494,7 @@ static struct TokenInfo global_setup_tokens[] = { 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_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" }, @@ -11664,6 +11666,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->time_limit = TRUE; si->fullscreen = FALSE; si->fullscreen_mode = getStringCopy(DEFAULT_FULLSCREEN_MODE); + si->window_scaling_percent = STD_WINDOW_SCALING_PERCENT; si->ask_on_escape = TRUE; si->ask_on_escape_editor = TRUE; si->quick_switch = FALSE;