diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-15 23:20:44 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-15 23:20:44 +0000 |
| commit | c5f460f024c071a1c56980dc89ab15b2cf860f8c (patch) | |
| tree | 0538c9d2a0b9c8dff1b95331f1e12b68f645f1fc /crawl-ref/source/enum.h | |
| parent | b845b3611b4c5cb1798618320211e0532de969ae (diff) | |
| download | crawl-ref-c5f460f024c071a1c56980dc89ab15b2cf860f8c.tar.gz crawl-ref-c5f460f024c071a1c56980dc89ab15b2cf860f8c.zip | |
Add various beam explosion-related cleanups. Also, make cleansing flame
an explosion of BEAM_HOLY around the player instead of an aimable
effect.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8467 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 0db2d35711..73809b4a37 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -399,10 +399,18 @@ enum char_set_type CSET_ASCII, // flat 7-bit ASCII CSET_IBM, // 8-bit ANSI/Code Page 437 CSET_DEC, // 8-bit DEC, 0xE0-0xFF shifted for line drawing chars - CSET_UNICODE, // Unicode. + CSET_UNICODE, // Unicode NUM_CSET }; +enum cleansing_flame_source_type +{ + CLEANSING_FLAME_GENERIC = -1, + CLEANSING_FLAME_SPELL = -2, // SPELL_FLAME_OF_CLEANSING + CLEANSING_FLAME_INVOCATION = -3, // ABIL_TSO_CLEANSING_FLAME + CLEANSING_FLAME_TSO = -4 // TSO effect +}; + enum cloud_type { CLOUD_NONE, @@ -1324,7 +1332,7 @@ enum holy_word_source_type HOLY_WORD_SCROLL = -2, HOLY_WORD_SPELL = -3, // SPELL_HOLY_WORD HOLY_WORD_ZIN = -4, // Zin effect - HOLY_WORD_SHINING_ONE = -5 // TSO effect + HOLY_WORD_TSO = -5 // TSO effect }; enum hunger_state // you.hunger_state @@ -1343,7 +1351,7 @@ enum immolation_source_type { IMMOLATION_GENERIC = -1, IMMOLATION_SCROLL = -2, - IMMOLATION_SPELL = -3 + IMMOLATION_SPELL = -3 // effect when fixing fire brand }; enum item_status_flag_type // per item flags: ie. ident status, cursed status @@ -3032,7 +3040,6 @@ enum zap_type ZAP_PAIN, ZAP_STICKY_FLAME, ZAP_DISPEL_UNDEAD, - ZAP_CLEANSING_FLAME, ZAP_BONE_SHARDS, ZAP_BANISHMENT, ZAP_DEGENERATION, |