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

Only consider attacks a failure when the attacker dies.

Browse source 
Allows player to easily auto-execute several "finishing move" attacks
in a row.
This commit is contained in:
Gabriel Morin 2011-11-23 13:40:46 +00:00
parent e08a4be552
commit f7332b1153
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/whiteboard/attack.cpp
View file

@ -109,9 +109,6 @@ void attack::accept(visitor& v)
void attack::execute(bool& success, bool& complete)
{
//Never continue an execute-all after an attack
success = false;
if (!valid_) {
complete = false;
return;
@ -132,6 +129,15 @@ void attack::execute(bool& success, bool& complete)
resources::controller->get_mouse_handler_base().attack_enemy(get_dest_hex(), get_target_hex(), weapon_choice_);
complete = true;
//check that attacking unit is still alive, if not, consider the attack a failure
unit_map::const_iterator survivor = resources::units->find(get_dest_hex());
if(!survivor.valid() || survivor->id() != unit_id_)
{
success = false;
}
success = true;
}
void attack::apply_temp_modifier(unit_map& unit_map)