Make mimics hold the item they're mimicking, instead of fragile hacks with saving RNG state.

1 files changed, 2 insertions, 7 deletions

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index 9eb534b0ff..cb3a461b61 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -380,21 +380,16 @@ void Stash::update()
 
         // There's something on this square. Take a squint at it.
         const item_def *pitem;
-        item_def mimic_item;
         if (_grid_has_mimic_item(p))
-        {
-            get_mimic_item(monster_at(p), mimic_item);
-            pitem = &mimic_item;
-        }
+            pitem = &get_mimic_item(monster_at(p));
         else
         {
             pitem = &mitm[igrd(p)];
+            tutorial_first_item(*pitem);
         }
 
         const item_def& item = *pitem;
 
-        tutorial_first_item(item);
-
         if (!_grid_has_perceived_multiple_items(p))
             items.clear();