Mixed commit of small additions/changes.

FR 1870139: output "Tele" among enchantment abbrevs
            when "about to teleport"
FR 1834016: print item slots along with rotting message
            (I added an option for this as I personally don't need this.)

Gods:
* Add ^ line for Zin's mutation protection.
* Modify protection from harm adjectives in ^ screen to make difference
  between Ely and Zin/TSO more obvious.

Tiles:
Bug 1870238: Show mimics to be "autopickuable" (green frame).
* Smarter handling of L-click actions in inventory.
* code clean-up


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

1 files changed, 20 insertions, 3 deletions

diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc
index 4a9e999c12..7e5f51a304 100644
--- a/crawl-ref/source/tile1.cc
+++ b/crawl-ref/source/tile1.cc
@@ -3583,7 +3583,7 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground)
     {
         return;
     }
-
+    
     const coord_def gc(gx, gy);
     const coord_def ep = view2show(grid2view(gc));
 
@@ -3592,8 +3592,25 @@ void tile_place_monster(int gx, int gy, int idx, bool foreground)
     int flag = t & (~TILE_FLAG_MASK);
     int mon_wep = menv[idx].inv[MSLOT_WEAPON];
 
-    if (menv[idx].type >=  MONS_DRACONIAN && 
-        menv[idx].type <= MONS_DRACONIAN_SCORCHER)
+    if (menv[idx].type >= MONS_GOLD_MIMIC &&
+        menv[idx].type <= MONS_POTION_MIMIC)
+    {
+        const monsters *mon = &menv[idx];
+        if (!mons_is_known_mimic(mon))
+        {
+            item_def item;
+            get_mimic_item( mon, item );
+            if (item_needs_autopickup(item))
+            {
+                if (foreground)
+                    env.tile_bg[ep.x-1][ep.y-1] |= TILE_FLAG_CURSOR3;
+                else
+                    env.tile_bk_bg[gx][gy] |= TILE_FLAG_CURSOR3;
+            }
+        }
+    }
+    else if (menv[idx].type >=  MONS_DRACONIAN &&
+             menv[idx].type <= MONS_DRACONIAN_SCORCHER)
     {
         int race = draco_subspecies(&menv[idx]);
         int cls = menv[idx].type;