Whiteboard: Revert 2010-08-14T06:44:20Z!gabrielmorin@gmail.com for now...

...and set temp units to be drawn first again (i.e. displayed below
the real units). The resulting visuals weren't convincing.
This commit is contained in:
Gabriel Morin 2010-08-18 01:40:58 +00:00
parent 2d9f13f107
commit 166cfee721

View file

@ -304,14 +304,6 @@ void game_display::draw_invalidated()
halo::unrender(invalidated_); halo::unrender(invalidated_);
display::draw_invalidated(); display::draw_invalidated();
foreach (const map_location& loc, invalidated_) {
unit_map::iterator u_it = units_.find(loc);
exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
if (u_it != units_.end()
&& (request == exclusive_unit_draw_requests_.end() || request->second == u_it->id()))
u_it->redraw_unit();
}
foreach(unit* temp_unit, temp_units_) { foreach(unit* temp_unit, temp_units_) {
const map_location& loc = temp_unit->get_location(); const map_location& loc = temp_unit->get_location();
exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc); exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
@ -320,6 +312,14 @@ void game_display::draw_invalidated()
temp_unit->redraw_unit(); temp_unit->redraw_unit();
} }
foreach (const map_location& loc, invalidated_) {
unit_map::iterator u_it = units_.find(loc);
exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
if (u_it != units_.end()
&& (request == exclusive_unit_draw_requests_.end() || request->second == u_it->id()))
u_it->redraw_unit();
}
halo::unrender(invalidated_); halo::unrender(invalidated_);
} }