summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/showsymb.cc
diff options
context:
space:
mode:
authorelliptic <hyperelliptical@gmail.com>2012-08-24 14:28:50 -0400
committerelliptic <hyperelliptical@gmail.com>2012-08-24 14:28:50 -0400
commit23a01bca34af0e3c8e00b36c456f6028b9daee1d (patch)
treed9ee3658134b06eb496931a2f5b1779cab83d76c /crawl-ref/source/showsymb.cc
parent5cddbb4c21c4890e9d9f01953c6efa107e906f08 (diff)
downloadcrawl-ref-23a01bca34af0e3c8e00b36c456f6028b9daee1d.tar.gz
crawl-ref-23a01bca34af0e3c8e00b36c456f6028b9daee1d.zip
Revert "Show out-of-sight excluded staircases in the proper colour."
This reverts commit 5cddbb4c21c4890e9d9f01953c6efa107e906f08. This didn't work right at all in some situations, unfortunately.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r--crawl-ref/source/showsymb.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc
index ad4e1e3979..b29fcf79b0 100644
--- a/crawl-ref/source/showsymb.cc
+++ b/crawl-ref/source/showsymb.cc
@@ -33,9 +33,7 @@ unsigned short _cell_feat_show_colour(const map_cell& cell,
// These aren't shown mossy/bloody/slimy.
const bool norecolour = is_critical_feature(feat) || feat_is_trap(feat);
- if (cell.flags & MAP_EXCLUDED_STAIRS)
- colour = Options.tc_excluded;
- else if (!coloured)
+ if (!coloured)
{
if (cell.flags & MAP_EMPHASIZE)
colour = fdef.seen_em_colour;
@@ -50,6 +48,9 @@ unsigned short _cell_feat_show_colour(const map_cell& cell,
return colour;
}
}
+
+ else if (cell.flags & MAP_EXCLUDED_STAIRS)
+ colour = Options.tc_excluded;
else if (feat >= DNGN_MINMOVE && cell.flags & MAP_WITHHELD)
{
// Colour grids that cannot be reached due to beholders