Fix the display of monsters in the tiles minimap. (My mistake, sorry.)

And remove the strange exception for shafts in the calling of handle_traps()
as brought up in Bug 1916327 (now discussion about levitation + traps).


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

1 files changed, 12 insertions, 11 deletions

diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index 024b1bf52b..4de458b23a 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -356,16 +356,6 @@ void GmapUpdate(int x, int y, int what, bool upd_tile)
     
     if (x == you.x_pos && y == you.y_pos)
         c = Options.tile_player_col; // player position always highlighted
-    else if (mgrd[x][y] != NON_MONSTER && upd_tile)
-    {
-        if (mons_friendly(&menv[mgrd[x][y]]))
-            c = Options.tile_friendly_col; // colour friendly monsters
-        else if (mons_neutral(&menv[mgrd[x][y]])
-                 && Options.tile_neutral_col != Options.tile_monster_col)
-        {
-            c = Options.tile_neutral_col;  // colour neutral monsters
-        }
-    }
     else
     {
         const coord_def gc(x,y);
@@ -386,7 +376,18 @@ void GmapUpdate(int x, int y, int what, bool upd_tile)
             c = _gmap_to_colour(gmap_col[what & 0xff]);
             break;
         }
-
+        if (c == Options.tile_monster_col && mgrd[x][y] != NON_MONSTER
+            && upd_tile)
+        {
+            if (mons_friendly(&menv[mgrd[x][y]]))
+                c = Options.tile_friendly_col; // colour friendly monsters
+            else if (mons_neutral(&menv[mgrd[x][y]])
+                     && Options.tile_neutral_col != Options.tile_monster_col)
+            {
+                c = Options.tile_neutral_col;  // colour neutral monsters
+            }
+        }
+        
         if (c == Options.tile_floor_col && is_excluded( coord_def(x,y) ))
             c = Options.tile_excluded_col;
     }