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

A terrain_type variable of the main function to draw a tile...

Browse source 
...was only used for checking village flag, so move it into the
get_flag function.
This commit is contained in:
Ali El Gariani 2007-08-03 03:46:04 +00:00
parent f8dbd5d14c
commit 27f86d2e06
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/game_display.cpp
View file

@ -305,12 +305,7 @@ void game_display::draw(bool update,bool force)
image_type = image::SEMI_BRIGHTENED;
}
*/
t_translation::t_letter terrain = t_translation::VOID_TERRAIN;
if(!is_shrouded || !on_map) {
terrain = map_.get_terrain(*it);
}
tile_stack_clear();
@ -319,7 +314,7 @@ void game_display::draw(bool update,bool force)
tile_stack_terrains(*it,tod.id, image_type, ADJACENT_BACKGROUND);
// village-control flags.
tile_stack_append(get_flag(terrain,*it));
tile_stack_append(get_flag(*it));
typedef overlay_map::const_iterator Itor;
@ -820,8 +815,10 @@ surface game_display::footstep_image(const gamemap::location& loc)
return image;
}
surface game_display::get_flag(const t_translation::t_letter& terrain, const gamemap::location& loc)
surface game_display::get_flag(const gamemap::location& loc)
{
t_translation::t_letter terrain = map_.get_terrain(loc);
if(!map_.is_village(terrain)) {
return surface(NULL);
}

2
src/game_display.hpp
View file

@ -182,7 +182,7 @@ private:
void draw_game_status();
//this surface must be freed by the caller
surface get_flag(const t_translation::t_letter& terrain, const gamemap::location& loc);
surface get_flag(const gamemap::location& loc);
unit_map& units_;