diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-10 18:12:14 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-10 18:12:14 +0000 |
commit | 43cb8a9ef46b1d25838accee8775b33b16420fbc (patch) | |
tree | 8cb57a8a5f6b3d7e9ed715f1e7065652b73d2b07 /crawl-ref/source/enum.h | |
parent | cea88b54eb8de6b931d3a1b7fa5fd251be4613b4 (diff) | |
download | crawl-ref-43cb8a9ef46b1d25838accee8775b33b16420fbc.tar.gz crawl-ref-43cb8a9ef46b1d25838accee8775b33b16420fbc.zip |
Remove the last vestiges of hellfrost.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8386 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r-- | crawl-ref/source/enum.h | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 951bf81c1d..7b8325b0ae 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -203,63 +203,62 @@ enum beam_type // beam[].flavour BEAM_HELLFIRE, BEAM_NAPALM, BEAM_STEAM, // 15 - BEAM_HELLFROST, BEAM_ENERGY, BEAM_HOLY, BEAM_FRAG, - BEAM_LAVA, // 20 - BEAM_ICE, + BEAM_LAVA, + BEAM_ICE, // 20 BEAM_NUKE, BEAM_RANDOM, // currently translates into FIRE..ACID BEAM_CHAOS, // Enchantments - BEAM_FIRST_ENCHANTMENT = 25, // 25 - BEAM_SLOW = BEAM_FIRST_ENCHANTMENT, - BEAM_HASTE, + BEAM_SLOW, + BEAM_FIRST_ENCHANTMENT = BEAM_SLOW, + BEAM_HASTE, // 25 BEAM_HEALING, BEAM_PARALYSIS, BEAM_CONFUSION, - BEAM_INVISIBILITY, // 30 - BEAM_DIGGING, + BEAM_INVISIBILITY, + BEAM_DIGGING, // 30 BEAM_TELEPORT, BEAM_POLYMORPH, BEAM_CHARM, - BEAM_BANISH, // 35 - BEAM_DEGENERATE, + BEAM_BANISH, + BEAM_DEGENERATE, // 35 BEAM_ENSLAVE_UNDEAD, BEAM_ENSLAVE_SOUL, BEAM_PAIN, - BEAM_DISPEL_UNDEAD, // 40 - BEAM_DISINTEGRATION, + BEAM_DISPEL_UNDEAD, + BEAM_DISINTEGRATION, // 40 BEAM_ENSLAVE_DEMON, BEAM_BLINK, BEAM_PETRIFY, - BEAM_BACKLIGHT, // 45 - BEAM_SLEEP, + BEAM_BACKLIGHT, + BEAM_SLEEP, // 45 BEAM_LAST_ENCHANTMENT = BEAM_SLEEP, // new beams for evaporate - BEAM_POTION_STINKING_CLOUD, // 47 + BEAM_POTION_STINKING_CLOUD, BEAM_POTION_POISON, BEAM_POTION_MIASMA, - BEAM_POTION_STEAM, // 50 - BEAM_POTION_FIRE, + BEAM_POTION_STEAM, + BEAM_POTION_FIRE, // 50 BEAM_POTION_COLD, BEAM_POTION_BLACK_SMOKE, BEAM_POTION_GREY_SMOKE, - BEAM_POTION_BLUE_SMOKE, // 55 - BEAM_POTION_PURP_SMOKE, + BEAM_POTION_BLUE_SMOKE, + BEAM_POTION_PURP_SMOKE, // 55 BEAM_POTION_RANDOM, BEAM_LAST_REAL = BEAM_POTION_RANDOM, // For getting the visual effect of a beam. - BEAM_VISUAL, // 58 + BEAM_VISUAL, // 57 - BEAM_TORMENT_DAMAGE, // Pseudo-beam for damage flavour. + BEAM_TORMENT_DAMAGE, // Pseudo-beam for damage flavour. BEAM_FIRST_PSEUDO = BEAM_TORMENT_DAMAGE, - BEAM_STEAL_FOOD, // {60} Pseudo-beam for harpies stealing food. + BEAM_STEAL_FOOD, // 59: Pseudo-beam for harpies stealing food. NUM_BEAMS }; @@ -3072,7 +3071,6 @@ enum zap_type ZAP_BREATHE_LIGHTNING, ZAP_PETRIFY, ZAP_ENSLAVE_SOUL, - ZAP_HELLFROST, ZAP_CHAOS, NUM_ZAPS }; |