From 928479a2ce6674d27d6ef03d7a06f81803ccdfae Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 27 Oct 2009 01:35:41 +0100 Subject: 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. --- crawl-ref/source/fight.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'crawl-ref/source/fight.cc') 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, -- cgit v1.2.3-54-g00ecf