summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-22 10:01:35 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-22 10:01:35 +0000
commitd473edf767361c19d6938c48ebd518f7d68824c1 (patch)
tree23ebe65e4e8df543a0160c3158e2c3524b16d3cc /crawl-ref/source/misc.cc
parent8f6c276eff93a39b5b0cc19d1e62423bafcd5347 (diff)
downloadcrawl-ref-d473edf767361c19d6938c48ebd518f7d68824c1.tar.gz
crawl-ref-d473edf767361c19d6938c48ebd518f7d68824c1.zip
Fix bug 2325392: Ring of Flames interface problems. Whether stepping into
a potentially damaging cloud prompts or not now takes into consideration temporary resistances and immunties, where before it only took into account permanent ones. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7535 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 2498be75ce..74e8d2e821 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2454,7 +2454,7 @@ bool i_feel_safe(bool announce, bool want_move, bool just_monsters, int range)
{
const cloud_type type = env.cloud[env.cgrid(you.pos())].type;
- if (is_damaging_cloud(type, false))
+ if (is_damaging_cloud(type, want_move))
{
if (announce)
{