renamed setup option token

diff --git a/src/files.c b/src/files.c
index a0115f711ed1e2a839be6f9bafc9216e096f5ca7..3e9f7fa2b8f607a5c1c6a1663c1558fc9595590d 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2383,7 +2383,7 @@ static void setLevelInfoToDefaults_Level(struct LevelInfo *level)
   level->file_has_custom_elements = FALSE;
 
   // set random colors for BD style levels according to preferred color type
-  SetRandomLevelColors_BD(setup.bd_color_type);
+  SetRandomLevelColors_BD(setup.bd_default_color_type);
 
   // set default color type and colors for BD style level colors
   SetDefaultLevelColorType_BD();
@@ -10757,7 +10757,7 @@ static struct TokenInfo global_setup_tokens[] =
   },
   {
     TYPE_INTEGER,
-    &setup.bd_color_type,                      "bd_color_type"
+    &setup.bd_default_color_type,              "bd_default_color_type"
   },
   {
     TYPE_SWITCH,
@@ -11586,7 +11586,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
   si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
   si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
-  si->bd_color_type = GD_DEFAULT_COLOR_TYPE;
+  si->bd_default_color_type = GD_DEFAULT_COLOR_TYPE;
   si->sp_show_border_elements = FALSE;
   si->small_game_graphics = FALSE;
   si->show_load_save_buttons = FALSE;

diff --git a/src/libgame/system.h b/src/libgame/system.h
index d3fcb89f7ad680186e9f12c48c04176d91b845d3..b0cda2a6e32b8130c3c337286547c12fce8302e5 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1518,7 +1518,7 @@ struct SetupInfo
   int bd_palette_c64;
   int bd_palette_c64dtv;
   int bd_palette_atari;
-  int bd_color_type;
+  int bd_default_color_type;
   boolean sp_show_border_elements;
   boolean small_game_graphics;
   boolean show_load_save_buttons;

diff --git a/src/screens.c b/src/screens.c
index a986ebd57e2adfa559a22ecc20576b5c7412f8bc..e64639ccb48428fd0b50cb0e71f43d63e5f4afe1 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -6468,7 +6468,7 @@ static void execSetupEngines_setColorType(void)
 
     // set current palette value to configured palette value
     bd_color_type_current =
-      getTreeInfoFromIdentifier(bd_color_types, i_to_a(setup.bd_color_type));
+      getTreeInfoFromIdentifier(bd_color_types, i_to_a(setup.bd_default_color_type));
 
     // if that fails, set current palette to reliable default value
     if (bd_color_type_current == NULL)
@@ -6480,7 +6480,7 @@ static void execSetupEngines_setColorType(void)
       bd_color_type_current = bd_color_types;
   }
 
-  setup.bd_color_type = atoi(bd_color_type_current->identifier);
+  setup.bd_default_color_type = atoi(bd_color_type_current->identifier);
 
   // needed for displaying palette text instead of identifier
   bd_color_type_text = bd_color_type_current->name;