Fix 2004501: buggy ?identify; also finally properly id ?identify itself

after a successful identification (if there are several).
Fix 2004793: wandering mushroom flees - for real, this time (I hope).


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6189 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index f0e5882a14..64a89331bf 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -4470,7 +4470,7 @@ int scan_randarts(randart_prop_type which_property, bool calc_unid)
         if (eq == -1)
             continue;
 
-        // only weapons give their effects when in our hands
+        // Only weapons give their effects when in our hands.
         if (i == EQ_WEAPON && you.inv[ eq ].base_type != OBJ_WEAPONS)
             continue;
 
@@ -4478,15 +4478,17 @@ int scan_randarts(randart_prop_type which_property, bool calc_unid)
             continue;
 
         // Ignore unidentified items [TileCrawl dump enhancements].
-        if (!item_ident(you.inv[ eq ], ISFLAG_KNOW_PROPERTIES) &&
-                !calc_unid)
+        if (!item_ident(you.inv[ eq ], ISFLAG_KNOW_PROPERTIES)
+            && !calc_unid)
+        {
             continue;
+        }
 
         retval += randart_wpn_property( you.inv[ eq ], which_property );
     }
 
     return (retval);
-}                               // end scan_randarts()
+}
 
 void modify_stat(stat_type which_stat, char amount, bool suppress_msg,
                  const char *cause, bool see_source)