Make many checks for monster (non)existence on squares use monster_at().

Not all are changed yet, as there are several index checks still needed
for debugging purposes.

Also, make many checks for player/monster (non)existence use actor_at().

1 files changed, 7 insertions, 9 deletions

diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index ce00292b20..20cd825e36 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1330,19 +1330,17 @@ void TilesFramework::update_minimap(int gx, int gy, map_feature f)
 
     coord_def gc(gx, gy);
 
-    if (you.pos() == gc && you.on_current_level)
-    {
+    if (gc == you.pos() && you.on_current_level)
         f = MF_PLAYER;
-    }
-    else if (f == MF_MONS_HOSTILE && mgrd[gx][gy] != NON_MONSTER)
+    else if (monster_at(gc) && f == MF_MONS_HOSTILE)
     {
-        const int grid = mgrd[gx][gy];
-        if (mons_friendly_real(&menv[grid]))
+        const monsters *mon = monster_at(gc);
+        if (mons_friendly_real(mon))
             f = MF_MONS_FRIENDLY;
-        else if (mons_class_flag(menv[grid].type, M_NO_EXP_GAIN))
-            f = MF_MONS_NO_EXP;
-        else if (mons_neutral(&menv[grid]))
+        else if (mons_neutral(mon))
             f = MF_MONS_NEUTRAL;
+        else if (mons_class_flag(mon->type, M_NO_EXP_GAIN))
+            f = MF_MONS_NO_EXP;
     }
     else if (f == MF_FLOOR || f == MF_MAP_FLOOR || f == MF_WATER)
     {