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

1 files changed, 7 insertions, 1 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 9cd7f6bb30..7fcace5605 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -121,7 +121,7 @@ bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift,
     {
         const cloud_type ctype = env.cloud[ cloud ].type;
         // Don't prompt if already in a cloud of the same type.
-        if (is_damaging_cloud(ctype, false)
+        if (is_damaging_cloud(ctype, true)
             && (env.cgrid(you.pos()) == EMPTY_CLOUD
                 || ctype != env.cloud[ env.cgrid(you.pos()) ].type))
         {
@@ -3846,6 +3846,12 @@ void display_char_status()
     if (you.duration[DUR_LIQUID_FLAMES])
         mpr("You are covered in liquid flames.");
 
+    if (you.duration[DUR_FIRE_SHIELD])
+    {
+        mpr("You are surrounded by a ring of flames.");
+        mpr("You are immune to clouds of flame.");
+    }
+
     if (you.duration[DUR_ICY_ARMOUR])
         mpr("You are protected by an icy shield.");