diff options
| -rw-r--r-- | crawl-ref/source/beam.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 0e1f9e7ef0..8ede85386e 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4791,7 +4791,7 @@ static mon_resist_type _affect_monster_enchantment(bolt &beam, monsters *mon) case BEAM_ENSLAVE_DEMON: #if DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, - "HD: %d; pow: %d", mon->hit_dice, beam.ench_power ); + "HD: %d; pow: %d", mon->hit_dice, beam.ench_power); #endif if (mon->hit_dice * 11 / 2 >= random2(beam.ench_power) diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 35f0257eee..d14b52057c 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -715,7 +715,7 @@ void drain_life(int pow) // Incoming power to this function is skill in INVOCATIONS, so // we'll add an assert here to warn anyone who tries to use // this function with spell level power. - ASSERT( pow <= 27 ); + ASSERT(pow <= 27); show_green = DARKGREY; viewwindow(true, false); @@ -747,6 +747,7 @@ void drain_life(int pow) hp_gain += hurted; monster->hurt(&you, hurted); + if (monster->alive()) print_wounds(monster); } @@ -754,13 +755,12 @@ void drain_life(int pow) hp_gain /= 2; - if (hp_gain > pow * 2) - hp_gain = pow * 2; + hp_gain = std::min(pow * 2, hp_gain); if (hp_gain) { - mpr( "You feel life flooding into your body." ); - inc_hp( hp_gain, false ); + mpr("You feel life flooding into your body."); + inc_hp(hp_gain, false); } } |