diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-20 22:53:13 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-20 22:53:13 +0000 |
commit | 8e6aed77dcf612ec06f14c8ad8f79d83d813ac5b (patch) | |
tree | 46b6b0d5cc01cc5e17bd77e47addf3508432855c /crawl-ref/source/player.cc | |
parent | 28b0d8ccf5840100bb223502ae19951c859d84b6 (diff) | |
download | crawl-ref-8e6aed77dcf612ec06f14c8ad8f79d83d813ac5b.tar.gz crawl-ref-8e6aed77dcf612ec06f14c8ad8f79d83d813ac5b.zip |
Clean up rotting in melee attacks to not kill the target directly and to
use special_damage_msg, as with draining.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8636 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r-- | crawl-ref/source/player.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 71635c8c13..086782330c 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6995,10 +6995,10 @@ void player::drain_stat(int stat, int amount, actor *attacker) lose_stat(stat, amount, false, ""); } -void player::rot(actor *who, int amount, int immediate) +bool player::rot(actor *who, int amount, int immediate, bool quiet) { if (res_rotting() > 0 || amount <= 0) - return; + return (false); if (immediate > 0) rot_hp(immediate); @@ -7007,6 +7007,8 @@ void player::rot(actor *who, int amount, int immediate) if (one_chance_in(4)) disease_player(50 + random2(100)); + + return (true); } bool player::drain_exp(actor *who, bool quiet) |