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

Fix compiler warning on some systems.

Browse source
This commit is contained in:
fendrin 2013-11-30 18:37:07 +01:00
parent 8a2cafb943
commit bee34271aa
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/minimap.cpp
View file

@ -175,26 +175,26 @@ surface getMinimap(int w, int h, const gamemap &map, const team *vw)
int side = village_owner(loc);
SDL_Color col;
SDL_Color col = int_to_color(game_config::team_rgb_range.find("white")->second.min());
if (fogged)
col = int_to_color(game_config::team_rgb_range.find("white")->second.min());
else if (side > -1) {
if (!fogged) {
if (side > -1) {
if (!preferences::minimap_movement_coding()) {
col = team::get_minimap_color(side + 1);
} else {
if (!preferences::minimap_movement_coding()) {
col = team::get_minimap_color(side + 1);
} else {
if (vw->owns_village(loc))
col = int_to_color(game_config::color_info(game_config::images::unmoved_orb_color).rep());
else if (vw->is_enemy(side + 1))
col = int_to_color(game_config::color_info(game_config::images::enemy_orb_color).rep());
else
col = int_to_color(game_config::color_info(game_config::images::ally_orb_color).rep());
}
if (vw->owns_village(loc))
col = int_to_color(game_config::color_info(game_config::images::unmoved_orb_color).rep());
else if (vw->is_enemy(side + 1))
col = int_to_color(game_config::color_info(game_config::images::enemy_orb_color).rep());
else
col = int_to_color(game_config::color_info(game_config::images::ally_orb_color).rep());
}
} else
col = int_to_color(game_config::team_rgb_range.find("white")->second.mid());
} else
col = int_to_color(game_config::team_rgb_range.find("white")->second.mid());
}
SDL_Rect fillrect = create_rect(
maprect.x +2