Dropped redundant and/or unused team color getters

wesnoth · Jul 12, 2019 · 9ef6705 · 9ef6705
1 parent a4622c7
commit 9ef6705
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp
@@ -917,7 +917,7 @@ DEFINE_FAI_FUNCTION(debug_label, 2, 2)
 	display* gui = display::get_singleton();
 	std::string team_name;
 
-	color_t color = team::get_side_rgb(ai_.get_side());
+	color_t color = team::get_side_color(ai_.get_side());
 
 	const terrain_label *res;
 	res = gui->labels().set_label(location, text, ai_.get_side() - 1, team_name, color);

diff --git a/src/menu_events.cpp b/src/menu_events.cpp
@@ -799,7 +799,7 @@ void menu_handler::label_terrain(mouse_handler& mousehandler, bool team_only)
 		if(team_only) {
 			team_name = gui_->labels().team_name();
 		} else {
-			color = team::get_side_rgb(gui_->viewing_side());
+			color = team::get_side_color(gui_->viewing_side());
 		}
 		const terrain_label* res = gui_->labels().set_label(loc, label, gui_->viewing_team(), team_name, color);
 		if(res) {

diff --git a/src/team.hpp b/src/team.hpp
@@ -366,9 +366,6 @@ class team
 	//function which, when given a 1-based side will return the color used by that side.
 	static const color_range get_side_color_range(int side);
 
-	static color_t get_side_rgb(int side) { return(get_side_color_range(side).mid()); }
-	static color_t get_side_rgb_max(int side) { return(get_side_color_range(side).max()); }
-	static color_t get_side_rgb_min(int side) { return(get_side_color_range(side).min()); }
 	static color_t get_side_color(int side);
 	static color_t get_minimap_color(int side);