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, 2 insertions, 3 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 4b6e615c5e..d2ebcec981 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4181,10 +4181,9 @@ static bool scroll_modify_item(const scroll_type scroll)
      case SCR_IDENTIFY:
         // This can cause a stupid situation where you try to identify the
         // very scroll you just read, causing you to waste the scroll.
-        if ( !fully_identified(item) )
+        if (!fully_identified(item))
         {
             mpr("This is a scroll of identify!");
-            set_ident_type( item, ID_KNOWN_TYPE );
             identify(-1, item_slot);
             return (true);
         }
@@ -4597,7 +4596,7 @@ void read_scroll( int slot )
     default:
         mpr("Read a buggy scroll, please report this.");
         break;
-    }                           // end switch
+    }
 
     set_ident_type( scroll,
                     (id_the_scroll) ? ID_KNOWN_TYPE : ID_TRIED_TYPE );