summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-05-06 17:21:48 -0600
committerSteve Melenchuk <smelenchuk@gmail.com>2014-05-07 18:23:33 -0600
commit6701b1f0ae42f5a218786a2aec37a9fc3d6091bc (patch)
treedfa29c69a40700f9c9cb411b84d08d7870830341 /crawl-ref/source/misc.cc
parentbf2d24ebf9c19c79d838329c2fc342501ff77856 (diff)
downloadcrawl-ref-6701b1f0ae42f5a218786a2aec37a9fc3d6091bc.tar.gz
crawl-ref-6701b1f0ae42f5a218786a2aec37a9fc3d6091bc.zip
Replace Q cloud displacement with cloud immunity (Bloax, elliptic).
Because getting trampled into your own clouds is terrible. Also disables this when under penance, which was an oversight for the former.
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 227716182d..4ea3de5b55 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1574,7 +1574,10 @@ bool i_feel_safe(bool announce, bool want_move, bool just_monsters,
// Temporary immunity allows travelling through a cloud but not
// resting in it.
- if (is_damaging_cloud(type, want_move))
+ // Qazlal immunity will allow for it, however.
+ if (is_damaging_cloud(type, want_move)
+ && (!you_worship(GOD_QAZLAL)
+ || player_under_penance()))
{
if (announce)
{