Get rid of multiple-meaning "int object" in env.show.

env.show is now a class show_def that stores tagged
unions of type show_type. For the moment, there's also
env.show_los for use in LOS determination, but that
should become an array of boolean at some point.

This breaks save compatibility.

Tiles and console version build and appear to work
fine, but this kind of change is likely to have
some side-effects.

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 376f1dc620..59dae41a82 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1310,9 +1310,9 @@ void TilesFramework::update_minimap(int gx, int gy)
     if (!player_in_mappable_area())
         return;
 
-    int object = env.map[gx][gy].object;
-    map_feature f = (object >= DNGN_START_OF_MONSTERS) ? MF_MONS_HOSTILE :
-        get_feature_def((dungeon_feature_type)object).minimap;
+    show_type object = env.map[gx][gy].object;
+    map_feature f = (object.cls == SH_MONSTER) ? MF_MONS_HOSTILE :
+        get_feature_def(object).minimap;
 
     if (f == MF_SKIP)
         f = get_feature_def(grd[gx][gy]).minimap;