renamed another preprocessor constant

diff --git a/src/files.c b/src/files.c
index 7869cb4b1b6c5dd762aaad8fd0efc06e571fd29f..4e5e7c831d386fb453b4ebe34ee2e3ba7c92de7e 100644 (file)
--- 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 76eea13540a74262bb87b8917c189b04a98c2433..06190e0b4c71671fb1f1b76989bf5aadb9a9e7f9 100644 (file)
--- 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 4e23cdeea885e74b92d2e9ebb673e7c684d694ae..92d201946e1cba83aeef95f03d00269d968f6e60 100644 (file)
--- 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           | \