summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/l_view.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/l_view.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/l_view.cc')
-rw-r--r--crawl-ref/source/l_view.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/l_view.cc b/crawl-ref/source/l_view.cc
index 0cff434745..bba081544f 100644
--- a/crawl-ref/source/l_view.cc
+++ b/crawl-ref/source/l_view.cc
@@ -39,9 +39,8 @@ LUAFN(view_is_safe_square)
if (c != CLOUD_NONE
&& is_damaging_cloud(c, true)
&& (!you_worship(GOD_QAZLAL)
- || !YOU_KILL(env.map_knowledge(p).cloudinfo()->killer)
- || adjacent(p, you.pos())
- && env.map_knowledge(you.pos()).cloud() != CLOUD_NONE))
+ || player_under_penance()
+ || !YOU_KILL(env.map_knowledge(p).cloudinfo()->killer)))
{
PLUARET(boolean, false);
return 1;