diff options
| author | Neil Moore <neil@s-z.org> | 2014-07-19 00:10:32 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-07-19 00:35:51 -0400 |
| commit | 3ac68266cf008522ce3602fcbb7098112a7f96ac (patch) | |
| tree | e4741b96c7c13ef6a825a5801261093cbbccb308 /crawl-ref/source/showsymb.cc | |
| parent | 754d02eb32291cb257964e8978180ca4e41cdfb8 (diff) | |
| download | crawl-ref-3ac68266cf008522ce3602fcbb7098112a7f96ac.tar.gz crawl-ref-3ac68266cf008522ce3602fcbb7098112a7f96ac.zip | |
Allow recolouring doors in vaults (#8466)
Mostly for pitsprint. If the door is sealed and unsealed, it
unfortunately loses its colour.
Diffstat (limited to 'crawl-ref/source/showsymb.cc')
| -rw-r--r-- | crawl-ref/source/showsymb.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/crawl-ref/source/showsymb.cc b/crawl-ref/source/showsymb.cc index ea19bef2c8..67bc95f863 100644 --- a/crawl-ref/source/showsymb.cc +++ b/crawl-ref/source/showsymb.cc @@ -33,12 +33,13 @@ static unsigned short _cell_feat_show_colour(const map_cell& cell, unsigned short colour = BLACK; const feature_def &fdef = get_feature_def(feat); - // These aren't shown mossy/bloody/slimy in console, nor do they - // obey vault recolouring. - const bool norecolour = feat > DNGN_OPEN_DOOR - || feat_is_door(feat) - // unknown traps won't get here - || feat == DNGN_MALIGN_GATEWAY; + // These do not obey vault recolouring. + const bool no_vault_recolour = feat > DNGN_OPEN_DOOR + // unknown traps won't get here + || feat == DNGN_MALIGN_GATEWAY; + + // These aren't shown mossy/bloody/slimy in console. + const bool norecolour = feat_is_door(feat) || no_vault_recolour; if (is_stair_exclusion(loc)) colour = Options.tc_excluded; @@ -88,7 +89,7 @@ static unsigned short _cell_feat_show_colour(const map_cell& cell, { colour = LIGHTGREEN; } - else if (cell.feat_colour() && !norecolour) + else if (cell.feat_colour() && !no_vault_recolour) colour = cell.feat_colour(); else { |