summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 21:31:22 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 21:31:22 +0000
commita6d89fbabb631ecbdcbb86c59aa70c28fd7da696 (patch)
treedeea069713bf8cbaf641f4804ff2024674c3b1a3 /crawl-ref/source/player.cc
parentcff1172ef03ea196d3bf59557e983bd0ad6cb7cc (diff)
downloadcrawl-ref-a6d89fbabb631ecbdcbb86c59aa70c28fd7da696.tar.gz
crawl-ref-a6d89fbabb631ecbdcbb86c59aa70c28fd7da696.zip
Consolidate the player and monster draining functions in fight.cc, make
monster draining take multiple levels of negative energy resistance into account, and only set the necromancy conduct if draining actually took place, as with draining beams. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8551 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index ebb8e10058..eebf92f4e6 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -7007,9 +7007,9 @@ void player::rot(actor *who, int amount, int immediate)
disease_player(50 + random2(100));
}
-void player::drain_exp(actor *who)
+bool player::drain_exp(actor *who)
{
- ::drain_exp();
+ return (::drain_exp());
}
void player::confuse(actor *who, int str)