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, 1 insertions, 32 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index c9b4d0e43a..2deffd9793 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1146,38 +1146,7 @@ enum dungeon_feature_type
     DNGN_PERMADRY_FOUNTAIN,
     DNGN_ABANDONED_SHOP,
 
-    NUM_REAL_FEATURES,                 //  208
-
-    // Real terrain must all occur before 256 to guarantee it fits
-    // into the unsigned char used for the grid!
-
-    // These aren't really terrain, but they're passed in and used
-    // to get their appearance character so I'm putting them here for now.
-    DNGN_ITEM_ORB        = 256,
-    DNGN_INVIS_EXPOSED   = 257,
-    DNGN_ITEM_WEAPON     = 258,
-    DNGN_ITEM_ARMOUR     = 259,
-    DNGN_ITEM_WAND       = 260,
-    DNGN_ITEM_FOOD       = 261,
-    DNGN_ITEM_UNUSED_1   = 262,
-    DNGN_ITEM_SCROLL     = 263,
-    DNGN_ITEM_RING       = 264,
-    DNGN_ITEM_POTION     = 265,
-    DNGN_ITEM_MISSILE    = 266,
-    DNGN_ITEM_BOOK       = 267,
-    DNGN_ITEM_UNUSED_2   = 268,
-    DNGN_ITEM_STAVE      = 269,
-    DNGN_ITEM_MISCELLANY = 270,
-    DNGN_ITEM_CORPSE     = 271,
-    DNGN_ITEM_GOLD       = 272,
-    DNGN_ITEM_AMULET     = 273,
-    DNGN_ITEM_DETECTED   = 274,
-
-    DNGN_CLOUD           = 280,
-    NUM_FEATURES,                 // for use in lookup table in view.cc
-
-    DNGN_RANDOM,
-    DNGN_START_OF_MONSTERS = 297  // don't go past here! see view.cc
+    NUM_FEATURES                       //  208
 };
 
 enum duration_type