summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-07-25 06:28:43 +0100
committerChris Campbell <chriscampbell89@gmail.com>2014-07-25 21:30:33 +0100
commitde178d7cde5e9e62b68406bd3685819d0aed721f (patch)
tree503ddeb3d264a4122aaf553a836c91afc6f51047 /crawl-ref/source/player.cc
parentd54d80d0058b7467c579a32e31c67a17ae467146 (diff)
downloadcrawl-ref-de178d7cde5e9e62b68406bd3685819d0aed721f.tar.gz
crawl-ref-de178d7cde5e9e62b68406bd3685819d0aed721f.zip
Revert "Put heavily drained players out of their misery"
Heavy draining already recovers quickly, such that it should be possible to recover even when killing low-XP monsters. If very heavy draining is still problematic, it might be better to scale down draining when already heavily drained, rather than making it behave in a different way entirely past a certain point. This reverts commit bc4cca05f1829bd4bb812008c01682b204ee4975 and commit 1c0d6e64a9a9.
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index e2c1f649f4..43773c3f6a 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -7207,9 +7207,7 @@ bool player::rot(actor *who, int amount, int immediate, bool quiet)
bool player::drain_exp(actor *who, bool quiet, int pow)
{
- return drain_player(pow, who ? who->mindex() : -1,
- who ? who->name(DESC_A, true).c_str() : NULL,
- !quiet);
+ return drain_player(pow, !quiet);
}
void player::confuse(actor *who, int str)