diff options
author | Robert Vollmert <rvollmert@gmx.net> | 2009-10-27 01:35:41 +0100 |
---|---|---|
committer | Robert Vollmert <rvollmert@gmx.net> | 2009-10-27 02:32:06 +0100 |
commit | 928479a2ce6674d27d6ef03d7a06f81803ccdfae (patch) | |
tree | f9c1a9ddd869efe1e725e870519cfc83b0259f75 /crawl-ref/source/fight.cc | |
parent | 2c33ddb4c83370db12567cdddaa7f4fe696481c9 (diff) | |
download | crawl-ref-928479a2ce6674d27d6ef03d7a06f81803ccdfae.tar.gz crawl-ref-928479a2ce6674d27d6ef03d7a06f81803ccdfae.zip |
Convert some ints to monster_type.
There's a whole lot of places that pass monster_type as int, often
with varying meanings for the value -1. This moves some of these
to monster_type, introducing MONS_NO_MONSTER and MONS_PLAYER as
new invalid special values.
Also improve on the autoexclude descriptions.
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r-- | crawl-ref/source/fight.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index f544fbd617..c769a4f563 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -5114,8 +5114,6 @@ void melee_attack::mons_perform_attack_rounds() mons_announce_hit(attk); check_defender_train_armour(); - const int type = defender->id(); - if (defender->can_bleed() && !defender->is_summoned() && !defender->submerged()) @@ -5126,7 +5124,7 @@ void melee_attack::mons_perform_attack_rounds() if (blood > defender->stat_hp()) blood = defender->stat_hp(); - bleed_onto_floor(pos, type, blood, true); + bleed_onto_floor(pos, defender->id(), blood, true); } if (decapitate_hydra(damage_done, |