X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=e5ca6168c5a3c5e4612d2460fad557ae3f0ce5a7;hb=bb0b4d6b538a625aaa98a25190891ef1fb766168;hp=d428ae99ef19ae1b39c96a97c0eea46a41395089;hpb=ec5b593331609b38b793231e43b0bf57ce309eb2;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index d428ae99..e5ca6168 100644 --- a/src/files.c +++ b/src/files.c @@ -7909,32 +7909,31 @@ 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_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_SHOW_SNAPSHOT_BUTTONS 29 -#define SETUP_TOKEN_GRAPHICS_SET 30 -#define SETUP_TOKEN_SOUNDS_SET 31 -#define SETUP_TOKEN_MUSIC_SET 32 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 33 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 34 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 35 -#define SETUP_TOKEN_VOLUME_SIMPLE 36 -#define SETUP_TOKEN_VOLUME_LOOPS 37 -#define SETUP_TOKEN_VOLUME_MUSIC 38 -#define SETUP_TOKEN_TOUCH_CONTROL_TYPE 39 -#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE 40 -#define SETUP_TOKEN_TOUCH_DROP_DISTANCE 41 - -#define NUM_GLOBAL_SETUP_TOKENS 42 +#define SETUP_TOKEN_WINDOW_SCALING_PERCENT 18 +#define SETUP_TOKEN_WINDOW_SCALING_QUALITY 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_SHOW_SNAPSHOT_BUTTONS 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 SETUP_TOKEN_TOUCH_CONTROL_TYPE 38 +#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE 39 +#define SETUP_TOKEN_TOUCH_DROP_DISTANCE 40 + +#define NUM_GLOBAL_SETUP_TOKENS 41 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -8084,7 +8083,6 @@ 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_SWITCH, &si.ask_on_escape, "ask_on_escape" }, @@ -8266,7 +8264,6 @@ 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->ask_on_escape = TRUE;