diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2011-07-04 12:00:13 -0500 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2011-07-04 12:00:13 -0500 |
commit | e51c6dc2c74f28635b9045d89fd4a45a0f420c54 (patch) | |
tree | cb5a7caf1c09603f1f68fa57beceee674880655c /crawl-ref/source/colour.cc | |
parent | 5982a6b0bee87f97586f406990ba9753b29ca5e0 (diff) | |
download | crawl-ref-e51c6dc2c74f28635b9045d89fd4a45a0f420c54.tar.gz crawl-ref-e51c6dc2c74f28635b9045d89fd4a45a0f420c54.zip |
Remove duplicate element color by subsuming ETC_NECRO into ETC_DEATH.
ETC_NECRO will be removed on the next major binary compatibility bump.
Diffstat (limited to 'crawl-ref/source/colour.cc')
-rw-r--r-- | crawl-ref/source/colour.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index 429b1b2d15..49e1ea82d5 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -356,18 +356,20 @@ void init_element_colours() 80, DARKGREY, 40, LIGHTGREY, 0)); - // assassin + // assassin, necromancer add_element_colour(_create_random_element_colour_calc( ETC_DEATH, "death", 80, DARKGREY, 40, MAGENTA, 0)); +#if TAG_MAJOR_VERSION == 32 // necromancer add_element_colour(_create_random_element_colour_calc( ETC_NECRO, "necro", 80, DARKGREY, 40, MAGENTA, 0)); +#endif // ie demonology add_element_colour(_create_random_element_colour_calc( ETC_UNHOLY, "unholy", |