From: Holger Schemel Date: Fri, 26 Apr 2024 10:49:45 +0000 (+0200) Subject: renamed another preprocessor constant X-Git-Tag: 4.4.0.0-test-1~39 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=dc51f089096a0c775d2a03d0b862a14d6ce88d51;p=rocksndiamonds.git renamed another preprocessor constant --- diff --git a/src/files.c b/src/files.c index 7869cb4b..4e5e7c83 100644 --- a/src/files.c +++ b/src/files.c @@ -10776,19 +10776,19 @@ static struct TokenInfo global_setup_tokens[] = &setup.bd_show_invisible_outbox, "bd_show_invisible_outbox" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.bd_smooth_movements, "bd_smooth_movements" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.bd_pushing_graphics, "bd_pushing_graphics" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.bd_up_down_graphics, "bd_up_down_graphics" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.bd_skip_falling_sounds, "bd_skip_falling_sounds" }, { @@ -10844,15 +10844,15 @@ static struct TokenInfo global_setup_tokens[] = &setup.music_set, "music_set" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.override_level_graphics, "override_level_graphics" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.override_level_sounds, "override_level_sounds" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.override_level_music, "override_level_music" }, { @@ -11572,7 +11572,7 @@ static struct TokenInfo debug_setup_tokens[] = &setup.debug.show_frames_per_second, "debug.show_frames_per_second" }, { - TYPE_SWITCH3, + TYPE_SWITCH_3_STATES, &setup.debug.xsn_mode, "debug.xsn_mode" }, { diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 76eea135..06190e0b 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -3232,7 +3232,7 @@ void setSetupInfo(struct TokenInfo *token_info, *(boolean *)setup_value = get_boolean_from_string(token_value); break; - case TYPE_SWITCH3: + case TYPE_SWITCH_3_STATES: *(int *)setup_value = get_switch3_from_string(token_value); break; @@ -4861,7 +4861,7 @@ char *getSetupValue(int type, void *value) strcpy(value_string, (*(boolean *)value ? "on" : "off")); break; - case TYPE_SWITCH3: + case TYPE_SWITCH_3_STATES: strcpy(value_string, (*(int *)value == MODE_AUTO ? "auto" : *(int *)value == FALSE ? "off" : "on")); break; diff --git a/src/libgame/setup.h b/src/libgame/setup.h index 4e23cdee..92d20194 100644 --- a/src/libgame/setup.h +++ b/src/libgame/setup.h @@ -19,7 +19,7 @@ // values for setup file handling #define TYPE_BOOLEAN (1 << 0) #define TYPE_SWITCH (1 << 1) -#define TYPE_SWITCH3 (1 << 2) +#define TYPE_SWITCH_3_STATES (1 << 2) #define TYPE_YES_NO (1 << 3) #define TYPE_YES_NO_AUTO (1 << 4) #define TYPE_ECS_AGA (1 << 5) @@ -61,7 +61,7 @@ // derived values for setup screen #define TYPE_VALUE (TYPE_BOOLEAN_STYLE | \ - TYPE_SWITCH3 | \ + TYPE_SWITCH_3_STATES | \ TYPE_YES_NO_AUTO | \ TYPE_KEY | \ TYPE_KEY_X11 | \