From 6f10cd2574eeb8a1417eff84718edd309287ac0d Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Wed, 4 Nov 2009 10:04:17 +0100 Subject: 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. --- crawl-ref/source/exclude.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/exclude.cc') diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc index f4ed190336..f9deb58f8b 100644 --- a/crawl-ref/source/exclude.cc +++ b/crawl-ref/source/exclude.cc @@ -95,8 +95,8 @@ struct opacity_excl : opacity_func return OPC_CLEAR; else if (!is_terrain_changed(p)) return _feat_opacity(env.grid(p)); - else if (env.map(p).object < NUM_REAL_FEATURES) - return _feat_opacity((dungeon_feature_type) env.map(p).object); + else if (env.map(p).object.cls == SH_FEATURE) + return _feat_opacity(env.map(p).object.feat); else { // If you have seen monsters, items or clouds there, -- cgit v1.2.3-54-g00ecf