From a6d89fbabb631ecbdcbb86c59aa70c28fd7da696 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 18 Jan 2009 21:31:22 +0000 Subject: 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 --- crawl-ref/source/player.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/player.cc') 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) -- cgit v1.2.3-54-g00ecf