summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/feature.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-30 06:07:37 -0400
committerNeil Moore <neil@s-z.org>2014-07-30 06:07:37 -0400
commitb4aa8020499028a17f1c1f5d6c64b2bedb041d99 (patch)
tree75567d4ecaa3c859429b606459b7af01ed99fdec /crawl-ref/source/feature.cc
parent54cd4fec6c292196e0b935ce7d43f36187d5e953 (diff)
downloadcrawl-ref-b4aa8020499028a17f1c1f5d6c64b2bedb041d99.tar.gz
crawl-ref-b4aa8020499028a17f1c1f5d6c64b2bedb041d99.zip
Fix magic mapping (#8838)
Diffstat (limited to 'crawl-ref/source/feature.cc')
-rw-r--r--crawl-ref/source/feature.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/feature.cc b/crawl-ref/source/feature.cc
index 7d8ed9fa8c..5dcab77cc4 100644
--- a/crawl-ref/source/feature.cc
+++ b/crawl-ref/source/feature.cc
@@ -24,7 +24,7 @@ void init_fd(feature_def &fd)
{
fd.feat = DNGN_UNSEEN;
fd.name = fd.vaultname = "";
- fd.dchar = NUM_DCHAR_TYPES;
+ fd.dchar = fd.magic_dchar = NUM_DCHAR_TYPES;
fd.symbol = fd.magic_symbol = 0;
fd.colour = fd.seen_colour = fd.em_colour = fd.seen_em_colour = BLACK;
fd.map_colour = DARKGREY;
@@ -57,8 +57,10 @@ static void _create_symbols(feature_def &f)
if (!f.symbol && f.dchar != NUM_DCHAR_TYPES)
f.symbol = Options.char_table[f.dchar];
- if (!f.magic_symbol)
+ if (f.magic_dchar == NUM_DCHAR_TYPES)
f.magic_symbol = f.symbol;
+ else
+ f.magic_symbol = Options.char_table[f.magic_dchar];
}
/** Put the feature overrides from the 'feature' option, stored in