upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 16:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix graphical glitch with crowns

Browse Source
This commit is contained in:
Jérémy Rosen 2006-04-23 09:40:16 +00:00
parent 18227b1bf8
commit bae01055d7
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/display.cpp
View File

@ -1326,9 +1326,18 @@ void display::draw_terrain_on_tile(int x, int y, image::TYPE image_type, ADJACEN
void display::draw_tile(int x, int y)
{
// list of tiles in the process of being redrawn (protect from recursion problems
static std::set<gamemap::location> redrawn;
reach_map::iterator reach = reach_map_.end();
const gamemap::location loc(x,y);
if(redrawn.find(loc) != redrawn.end()) {
//this tile has already redrawn the terrain and is waiting to redraw the "upper half" (unit)
return;
}
unit_map::iterator it = units_.find(loc);
if(it != units_.end()) {
it->second.refresh();
@ -1433,7 +1442,21 @@ void display::draw_tile(int x, int y)
draw_movement_info(loc,xpos,ypos);
}
//first half is done, mark ourselves as half refreshed
redrawn.insert(loc);
gamemap::location adjacent[6];
get_adjacent_tiles(loc, adjacent);
for(int tile = 0; tile != 6; ++tile) {
if(units_.find(adjacent[tile]) != units_.end()) {
// neighbour contains a unit, since its unit could overlap on us, we must redraw it
draw_tile(adjacent[tile].x, adjacent[tile].y);
}
}
if(it != units_.end()) {
// neighbours must be redrawn because we overlap on them
for(int tile = 0; tile != 6; ++tile) {
draw_tile(adjacent[tile].x, adjacent[tile].y);
}
it->second.refresh_unit(*this,loc,true);
}
@ -1486,6 +1509,8 @@ void display::draw_tile(int x, int y)
}
update_rect(xpos,ypos,zoom_,zoom_);
//redrawing is done
redrawn.erase(loc);
}
void display::draw_enemies_reach(unsigned int num, int xloc, int yloc)

8
src/unit.cpp
View File

@ -1603,14 +1603,6 @@ void unit::refresh_unit(display& disp,gamemap::location hex,bool with_status)
ellipse_front.assign(image::get_image(image::locator(buf,team_rgb_range(),temp_rgb)));
}
gamemap::location adjacent[6];
get_adjacent_tiles(hex, adjacent);
disp.draw_tile(hex.x, hex.y);
if(state_ != STATE_STANDING) {
for(int tile = 0; tile != 6; ++tile) {
disp.draw_tile(adjacent[tile].x, adjacent[tile].y);
}
}
disp.draw_unit(x, y -height_adjust, image, false, highlight_ratio,
blend_with, blend_ratio, submerge,ellipse_back,ellipse_front);
if(!unit_halo_ && !image_halo().empty()) {