summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/cloud.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/cloud.cc')
-rw-r--r--crawl-ref/source/cloud.cc5
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);