0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add comments about minimap.cpp's use of "team colors"

Browse source 
Maybe the "team_rgb_range" should be renamed as "named_color_range", because
it's used for everything defined by the WML `[color_range]` tag. In addition to
the ones normally used for teams (`red`, `lightblue`, etc) it has the minimap
colors for `reef`, `cave`, etc.

Separating the team colors from the terrain colors probably shouldn't be done.
Looking from the opposite perspective, using the terrain colors as team colors
has been discussed on the forums and found to be a useful feature:

* https://r.wesnoth.org/p627592
* https://r.wesnoth.org/p627588
This commit is contained in:
Steve Cotton 2020-05-05 09:41:28 +02:00 • committed by Steve Cotton
parent fece902b41
commit 6d6414d068
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game_config.hpp
View file

@ -150,6 +150,10 @@ namespace game_config
extern std::vector<std::string> foot_speed_prefix;
extern std::string foot_teleport_enter, foot_teleport_exit;
/**
* Colors defined by WML [color_range] tags. In addition to team colors such as "red" and
* "blue", this also contains the colors used on the minimap for "cave", "fungus" etc.
*/
extern std::map<std::string, color_range> team_rgb_range;
extern std::map<std::string, t_string> team_rgb_name;
extern std::map<std::string, std::vector<color_t>> team_rgb_colors;

2
src/minimap.cpp
View file

@ -179,6 +179,8 @@ surface getMinimap(int w, int h, const gamemap &map, const team *vw, const std::
} else {
// Despite its name, game_config::team_rgb_range isn't just team colors,
// it has "red", "lightblue", "cave", "reef", "fungus", etc.
color_t col;
std::map<std::string, color_range>::const_iterator it = game_config::team_rgb_range.find(terrain_info.id());
if (it == game_config::team_rgb_range.end()) {