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.h | |
| 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.h')
| -rw-r--r-- | crawl-ref/source/colour.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/colour.h b/crawl-ref/source/colour.h index 5835e55e67..f6f2e358c2 100644 --- a/crawl-ref/source/colour.h +++ b/crawl-ref/source/colour.h @@ -23,8 +23,10 @@ enum element_type ETC_HEAL, // holy healing (not necromantic stuff) ETC_HOLY, // general "good" god effects ETC_DARK, // darkness - ETC_DEATH, // currently only assassin (and equal to ETC_NECRO) + ETC_DEATH, // assassin/necromancy stuff +#if TAG_MAJOR_VERSION == 32 ETC_NECRO, // necromancy stuff +#endif ETC_UNHOLY, // demonology stuff ETC_VEHUMET, // vehumet's oddball colours ETC_BEOGH, // Beogh altar colours |