summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-miscast.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-05-29 04:13:03 +0200
committerAdam Borowski <kilobyte@angband.pl>2013-05-29 04:13:03 +0200
commitbad48d64c2a38978bf4ccf19931ea0483f60c843 (patch)
tree9a752b043b13500799e3f8ba404f253fef404612 /crawl-ref/source/spl-miscast.cc
parent42993c7a02bf24d02280df06c7140851e8cabb1a (diff)
parentaff44e3dcf63bf0a5426c8d6998c8954bb44d26d (diff)
downloadcrawl-ref-bad48d64c2a38978bf4ccf19931ea0483f60c843.tar.gz
crawl-ref-bad48d64c2a38978bf4ccf19931ea0483f60c843.zip
Merge branch 'lava_orcs' into lava_djinn
Waiting for Grotesks and the Forest to go live!
Diffstat (limited to 'crawl-ref/source/spl-miscast.cc')
-rw-r--r--crawl-ref/source/spl-miscast.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/spl-miscast.cc b/crawl-ref/source/spl-miscast.cc
index a0d87c33cf..c5b9077cdc 100644
--- a/crawl-ref/source/spl-miscast.cc
+++ b/crawl-ref/source/spl-miscast.cc
@@ -672,11 +672,9 @@ bool MiscastEffect::avoid_lethal(int dam)
if (recursion_depth == MAX_RECURSE)
{
-#if defined(DEBUG_DIAGNOSTICS) || defined(DEBUG_MISCAST)
- mpr("Couldn't avoid lethal miscast: too much recursion.",
- MSGCH_ERROR);
-#endif
- return false;
+ // Any possible miscast would kill you, now that's interesting.
+ mpr("Xom watches you with interest.");
+ return true;
}
if (did_msg)