diff --git a/data/game_config.cfg b/data/game_config.cfg index e4b977197a9..6dde151d8b5 100644 --- a/data/game_config.cfg +++ b/data/game_config.cfg @@ -49,8 +49,6 @@ [colors] ally_orb_color="lightblue" - # on the minimap, disengaged uses the same color as partial - disengaged_orb_color="brightorange" enemy_orb_color="black" moved_orb_color="red" partial_orb_color="brightorange" diff --git a/data/schema/core/config.cfg b/data/schema/core/config.cfg index 9691108b7d7..27ddb074414 100644 --- a/data/schema/core/config.cfg +++ b/data/schema/core/config.cfg @@ -52,7 +52,6 @@ name="colors" min=1 {SIMPLE_KEY ally_orb_color string} - {SIMPLE_KEY disengaged_orb_color string} {SIMPLE_KEY enemy_orb_color string} {SIMPLE_KEY moved_orb_color string} {SIMPLE_KEY partial_orb_color string} diff --git a/src/game_config.cpp b/src/game_config.cpp index 7332c265d44..6a7921458f8 100644 --- a/src/game_config.cpp +++ b/src/game_config.cpp @@ -170,7 +170,6 @@ std::vector default_colors; namespace colors { std::string ally_orb_color; -std::string disengaged_orb_color; std::string enemy_orb_color; std::string moved_orb_color; std::string partial_orb_color; @@ -315,7 +314,6 @@ void load_config(const config &v) partial_orb_color = i["partial_orb_color"].str(); enemy_orb_color = i["enemy_orb_color"].str(); ally_orb_color = i["ally_orb_color"].str(); - disengaged_orb_color = i["disengaged_orb_color"].str(); } // colors show_ally_orb = v["show_ally_orb"].to_bool(true); diff --git a/src/game_config.hpp b/src/game_config.hpp index c2d9dbeeddf..d2daeb6e160 100644 --- a/src/game_config.hpp +++ b/src/game_config.hpp @@ -90,7 +90,6 @@ namespace game_config namespace colors { extern std::string ally_orb_color; - extern std::string disengaged_orb_color; extern std::string enemy_orb_color; extern std::string moved_orb_color; extern std::string partial_orb_color; diff --git a/src/gui/dialogs/select_orb_colors.cpp b/src/gui/dialogs/select_orb_colors.cpp index 7de54fe730e..ed5df98cc69 100644 --- a/src/gui/dialogs/select_orb_colors.cpp +++ b/src/gui/dialogs/select_orb_colors.cpp @@ -82,8 +82,6 @@ void select_orb_colors::post_show(window&) preferences::set_unmoved_color(groups_["unmoved"].get_active_member_value()); preferences::set_partial_color(groups_["partial"].get_active_member_value()); - // For the minimap, show disengaged units as partially moved - preferences::set_disengaged_color(groups_["partial"].get_active_member_value()); preferences::set_moved_color(groups_["moved"].get_active_member_value()); preferences::set_allied_color(groups_["ally"].get_active_member_value()); preferences::set_enemy_color(groups_["enemy"].get_active_member_value()); diff --git a/src/preferences/general.cpp b/src/preferences/general.cpp index dc5987baaf1..39e4f937ac1 100644 --- a/src/preferences/general.cpp +++ b/src/preferences/general.cpp @@ -379,16 +379,6 @@ void set_partial_color(const std::string& color_id) { prefs["partial_orb_color"] = color_id; } -std::string disengaged_color() { - std::string disengaged_color = get("disengaged_orb_color"); - if (disengaged_color.empty()) - return game_config::colors::disengaged_orb_color; - return fix_orb_color_name(disengaged_color); -} -void set_disengaged_color(const std::string& color_id) { - prefs["disengaged_orb_color"] = color_id; -} - bool scroll_to_action() { return get("scroll_to_action", true); diff --git a/src/preferences/general.hpp b/src/preferences/general.hpp index e764df3f8f4..ae5d9b66155 100644 --- a/src/preferences/general.hpp +++ b/src/preferences/general.hpp @@ -185,9 +185,6 @@ namespace preferences { std::string moved_color(); void set_moved_color(const std::string& color_id); - std::string disengaged_color(); - void set_disengaged_color(const std::string& color_id); - bool show_ally_orb(); void set_show_ally_orb(bool show_orb); diff --git a/src/units/orb_status.cpp b/src/units/orb_status.cpp index b1b9d3aa011..50419a49d8a 100644 --- a/src/units/orb_status.cpp +++ b/src/units/orb_status.cpp @@ -45,7 +45,7 @@ std::string orb_status_helper::get_orb_color(orb_status os) case orb_status::moved: return preferences::moved_color(); case orb_status::disengaged: - return preferences::disengaged_color(); + [[fallthrough]]; // use partial_color() for any context that wants a single color case orb_status::partial: return preferences::partial_color(); case orb_status::allied: