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

Fix broken attack dialog (by 2010-06-13T21:53:10Z!alinkmaze@gmail.com)

Browse source
This commit is contained in:
Ali El Gariani 2010-06-14 14:38:35 +00:00
parent ad66bde757
commit 5f8342ec39
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mouse_events.cpp
View file

@ -779,11 +779,15 @@ void mouse_handler::attack_enemy_(const map_location attacker_loc, const map_loc
resources::redo_stack->clear();
unit_map::iterator attacker = find_unit(attacker_loc);
if(attacker == units_.end() || attacker->side() == side_num_ || attacker->incapacitated())
if(attacker == units_.end()
|| attacker->side() != side_num_
|| attacker->incapacitated())
return;
unit_map::iterator defender = find_unit(defender_loc);
if(defender == units_.end() || current_team().is_enemy(defender->side()) || defender->incapacitated())
if(defender == units_.end()
|| current_team().is_enemy(defender->side()) == false
|| defender->incapacitated())
return;
std::vector<battle_context> bc_vector;