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

Fix display bug from 2006-04-29T13:31:07Z!rusty@rustcorp.com.au...

Browse source 
...where health bars & balls were not clipped into viewport.
Also rename refresh_unit to redraw_unit as suggested by Boucman.
This commit is contained in:
Rusty Russell 2006-04-29 14:17:30 +00:00
parent 3a3fb7d449
commit 8ee4c19c48
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/display.cpp
View file

@ -845,12 +845,16 @@ void display::draw(bool update,bool force)
// them last, and (2) redraw them if they are adjacent existing hexes.
std::set<gamemap::location> unit_invals;
SDL_Rect clip_rect = map_area();
surface const dst(screen_.getSurface());
clip_rect_setter set_clip_rect(dst, clip_rect);
std::set<gamemap::location>::const_iterator it;
for(it = invalidated_.begin(); it != invalidated_.end(); ++it) {
if (units_.find(*it) != units_.end()) {
unit_invals.insert(*it);
}
draw_tile(*it);
draw_tile(*it, clip_rect);
gamemap::location adjacent[6];
get_adjacent_tiles(*it, adjacent);
@ -863,11 +867,11 @@ void display::draw(bool update,bool force)
for(it = unit_invals.begin(); it != unit_invals.end(); ++it) {
unit &u = units_.find(*it)->second;
u.refresh();
u.refresh_unit(*this, *it, true);
u.redraw_unit(*this, *it, true);
}
if (temp_unit_ && invalidated_.find(temp_unit_loc_) != invalidated_.end()) {
temp_unit_->refresh();
temp_unit_->refresh_unit(*this, temp_unit_loc_, false);
temp_unit_->redraw_unit(*this, temp_unit_loc_, false);
}
invalidated_.clear();
}
@ -1347,7 +1351,7 @@ void display::draw_terrain_on_tile(int x, int y, image::TYPE image_type, ADJACEN
}
}
void display::draw_tile(const gamemap::location &loc)
void display::draw_tile(const gamemap::location &loc, const SDL_Rect &clip_rect)
{
reach_map::iterator reach = reach_map_.end();
@ -1359,8 +1363,6 @@ void display::draw_tile(const gamemap::location &loc)
int xpos = int(get_location_x(loc));
int ypos = int(get_location_y(loc));
SDL_Rect clip_rect = map_area();
if(xpos >= clip_rect.x + clip_rect.w || ypos >= clip_rect.y + clip_rect.h ||
xpos + zoom_ < clip_rect.x || ypos + zoom_ < clip_rect.y) {
return;
@ -1368,8 +1370,6 @@ void display::draw_tile(const gamemap::location &loc)
surface const dst(screen_.getSurface());
clip_rect_setter set_clip_rect(dst,clip_rect);
const bool is_shrouded = shrouded(loc.x, loc.y);
gamemap::TERRAIN terrain = gamemap::VOID_TERRAIN;

2
src/display.hpp
View file

@ -376,7 +376,7 @@ private:
display(const display&);
void operator=(const display&);
void draw_tile(const gamemap::location &loc);
void draw_tile(const gamemap::location &loc, const SDL_Rect &clip_rect);
void draw_sidebar();
void draw_minimap(int x, int y, int w, int h);
void draw_game_status();

2
src/unit.cpp
View file

@ -1496,7 +1496,7 @@ void unit::restart_animation(const display& disp,int start_time) {
frame_begin_time = start_time -1;
}
void unit::refresh_unit(display& disp,gamemap::location hex,bool with_status)
void unit::redraw_unit(display& disp,gamemap::location hex,bool with_status)
{
const gamemap & map = disp.get_map();
if(hidden_) {

2
src/unit.hpp
View file

@ -158,7 +158,7 @@ class unit
// a sdl surface, ready for display for place where we need a fix image of the unit
const surface still_image() const;
void refresh_unit(display& disp,gamemap::location hex, bool with_status =false);
void redraw_unit(display& disp,gamemap::location hex, bool with_status =false);
void set_standing(const display& disp);
void set_defending(const display& disp, int damage, std::string range);