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

Attack Enemy: Don't show "poison" in the attacks list if the enemy is unpoisonable.

Browse source
This commit is contained in:
josteph 2018-11-03 19:13:52 +00:00 • committed by jostephd
parent 5ab1bac38c
commit 526d22648e
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/units/abilities.cpp
View file

@ -1027,6 +1027,11 @@ bool attack_type::special_active(const config& special, AFFECTS whom,
temporary_facing self_facing(self, self_loc_.get_relative_dir(other_loc_));
temporary_facing other_facing(other, other_loc_.get_relative_dir(self_loc_));
// Filter poison
if (special["id"] == "poison" && other && other->get_state("unpoisonable")) {
return false;
}
// Translate our context into terms of "attacker" and "defender".
unit_const_ptr & att = is_attacker_ ? self : other;
unit_const_ptr & def = is_attacker_ ? other : self;