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

Fixed #13995:

Browse source 
now, steps go below units & foregrounds (as before), but movement text
goes above.
This commit is contained in:
Philippe Plantier 2005-08-21 16:22:15 +00:00
parent 6df5744746
commit 8bf2fda5bf
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/display.cpp
View file

@ -1550,7 +1550,6 @@ void display::draw_tile(int x, int y, surface unit_image, fixed_t alpha, Uint32
SDL_BlitSurface(overlay_surface,NULL,dst,&dstrect);
}
}
draw_footstep(loc,xpos,ypos);
} else {
//FIXME: shouldn't void.png and fog.png be in the program configuration?
surface surface(image::get_image("terrain/void.png"));
@ -1564,10 +1563,12 @@ void display::draw_tile(int x, int y, surface unit_image, fixed_t alpha, Uint32
SDL_BlitSurface(surface,NULL,dst,&dstrect);
}
draw_footstep(loc,xpos,ypos);
draw_unit_on_tile(x,y,unit_image,alpha,blend_to);
if(!shrouded(x,y)) {
if(!is_shrouded) {
draw_terrain_on_tile(x,y,image_type,ADJACENT_FOREGROUND);
draw_movement_info(loc,xpos,ypos);
}
if(fogged(x,y) && shrouded(x,y) == false) {
@ -1626,8 +1627,6 @@ void display::draw_footstep(const gamemap::location& loc, int xloc, int yloc)
if(i == route_.steps.begin() || i == route_.steps.end())
return;
const bool show_time = (i+1 == route_.steps.end());
const bool left_foot = is_even(i - route_.steps.begin());
//generally we want the footsteps facing toward the direction they're going
@ -1698,6 +1697,13 @@ void display::draw_footstep(const gamemap::location& loc, int xloc, int yloc)
}
draw_unit(xloc,yloc,image,vflip,ftofxp(0.5));
}
void display::draw_movement_info(const gamemap::location& loc, int xloc, int yloc)
{
std::vector<gamemap::location>::const_iterator i =
std::find(route_.steps.begin(),route_.steps.end(),loc);
const bool show_time = (i+1 == route_.steps.end());
if(show_time == false) {
return;
@ -1706,6 +1712,7 @@ void display::draw_footstep(const gamemap::location& loc, int xloc, int yloc)
std::stringstream text;
#ifndef USE_TINY_GUI
const unit_map::const_iterator un = units_.find(route_.steps.front());
if(un != units_.end() && zoom_ >= DefaultZoom) {
text << (100-un->second.defense_modifier(map_,map_.get_terrain(loc))) << "%";
}

3
src/display.hpp
View file

@ -208,6 +208,9 @@ public:
//return with no effect.
void draw_footstep(const gamemap::location& loc, int xloc, int yloc);
//draws the movement info (turns available) for a given location
void draw_movement_info(const gamemap::location& loc, int xloc, int yloc);
//gets the underlying screen object.
CVideo& video() { return screen_; }