diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-02 13:01:03 -0600 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-02 13:01:03 -0600 |
commit | 112341df7929da3f2c76d6f4a418c44ff4ff4792 (patch) | |
tree | 804e292c065f891cf25ba38de69046cfecfb2790 /crawl-ref/source/mon-act.cc | |
parent | 9cb05b863b9f9fac6db2afe71cbd9d9fcb9080b1 (diff) | |
download | crawl-ref-112341df7929da3f2c76d6f4a418c44ff4ff4792.tar.gz crawl-ref-112341df7929da3f2c76d6f4a418c44ff4ff4792.zip |
Add minor cosmetic fixes.
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
-rw-r--r-- | crawl-ref/source/mon-act.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 269fbb48ad..4a67c4d57c 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -2192,9 +2192,9 @@ static bool _monster_eat_item(monsters *monster, bool nearby) int quant = si->quantity; - death_ooze_ate_good = (get_weapon_brand(*si) == SPWPN_HOLY_WRATH - || get_ammo_brand(*si) == SPMSL_SILVER - && monster->type == MONS_DEATH_OOZE); + death_ooze_ate_good = (monster->type == MONS_DEATH_OOZE + && (get_weapon_brand(*si) == SPWPN_HOLY_WRATH + || get_ammo_brand(*si) == SPMSL_SILVER)); if (si->base_type != OBJ_GOLD) { @@ -2292,13 +2292,11 @@ static bool _monster_eat_item(monsters *monster, bool nearby) hps_changed = std::min(hps_changed, 50); if (death_ooze_ate_good) - { monster->hurt(NULL, hps_changed, BEAM_NONE, false); - } else { // This is done manually instead of using heal_monster(), - // because that function doesn't work quite this way. -- bwr + // because that function doesn't work quite this way. - bwr monster->hit_points += hps_changed; monster->max_hit_points = std::max(monster->hit_points, monster->max_hit_points); @@ -2310,11 +2308,10 @@ static bool _monster_eat_item(monsters *monster, bool nearby) nearby ? "" : " distant"); } - if (eaten_net) - simple_monster_message(monster, " devours the net!"); - if (death_ooze_ate_good) simple_monster_message(monster, " twists violently!"); + else if (eaten_net) + simple_monster_message(monster, " devours the net!"); else _jelly_divide(monster); } |