summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/showsymb.cc
diff options
context:
space:
mode:
authorelliptic <hyperelliptical@gmail.com>2012-08-24 13:27:16 -0400
committerelliptic <hyperelliptical@gmail.com>2012-08-24 13:27:16 -0400
commit5cddbb4c21c4890e9d9f01953c6efa107e906f08 (patch)
tree45e1bf5b33ec0fd9e15edd717c79346592eb1d09 /crawl-ref/source/showsymb.cc
parentffbf010301249facd63791a7eed976152afbea40 (diff)
downloadcrawl-ref-5cddbb4c21c4890e9d9f01953c6efa107e906f08.tar.gz
crawl-ref-5cddbb4c21c4890e9d9f01953c6efa107e906f08.zip
Show out-of-sight excluded staircases in the proper colour.
Instead of having them change colour when you enter sight of them or when you press X.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
-rw-r--r--crawl-ref/source/showsymb.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc
index b29fcf79b0..ad4e1e3979 100644
--- a/crawl-ref/source/showsymb.cc
+++ b/crawl-ref/source/showsymb.cc
@@ -33,7 +33,9 @@ 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 (!coloured)
+ if (cell.flags & MAP_EXCLUDED_STAIRS)
+ colour = Options.tc_excluded;
+ else if (!coloured)
{
if (cell.flags & MAP_EMPHASIZE)
colour = fdef.seen_em_colour;
@@ -48,9 +50,6 @@ 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