diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-22 10:01:35 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-22 10:01:35 +0000 |
| commit | d473edf767361c19d6938c48ebd518f7d68824c1 (patch) | |
| tree | 23ebe65e4e8df543a0160c3158e2c3524b16d3cc /crawl-ref/source/cloud.cc | |
| parent | 8f6c276eff93a39b5b0cc19d1e62423bafcd5347 (diff) | |
| download | crawl-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/cloud.cc')
| -rw-r--r-- | crawl-ref/source/cloud.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 6229485d19..5c1f6a7512 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -614,8 +614,11 @@ bool is_damaging_cloud(cloud_type type, bool temp) { switch (type) { - // always harmful + // always harmful... case CLOUD_FIRE: + // ... unless a Ring of Flames is up and it's a fire cloud. + if (temp && you.duration[DUR_FIRE_SHIELD]) + return (false); case CLOUD_COLD: return (true); |