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

Used the original defender and restored its hitpoints...

Browse source 
...instead of copying it to a temporary unit. (Partial fix for bug #16363.)

This brings the profile footprint of unit_attack from 7% to negligible.
This commit is contained in:
Guillaume Melquiond 2010-08-06 18:12:33 +00:00
parent d48a63a995
commit e7ecd91a58
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/unit_display.cpp
View file

@ -321,12 +321,8 @@ void unit_attack(
const unit_map::iterator def = units.find(b);
assert(def != units.end());
// do a copy so we can change the caracteristics
unit defender = *def;
bool was_hidden = defender.get_hidden();
def->set_hidden(true);
disp->place_temporary_unit(&defender);
unit &defender = *def;
int def_hitpoints = defender.hitpoints();
att->set_facing(a.get_relative_dir(b));
def->set_facing(b.get_relative_dir(a));
@ -409,8 +405,7 @@ void unit_attack(
// pass the animation back to the real unit
def->start_animation(animator.get_end_time(), defender_anim, true);
reset_helpers(&*att, &*def);
disp->remove_temporary_unit(&defender);
def->set_hidden(was_hidden);
def->set_hitpoints(def_hitpoints);
}
// private helper function, set all helpers to default position