Redid monster death idiom so that monsters::hurt can implicitly

call monster_die(). (This behaviour can be overriden.)
Minor code cleanups elsewhere, removal of dead code from bolt.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7123 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 29 insertions, 27 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index dca549073d..64c48819e6 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -175,68 +175,70 @@ enum quiver_type
 
 enum beam_type                  // beam[].flavour
 {
-    BEAM_NONE,                    //    0
+    BEAM_NONE,
 
     BEAM_MISSILE,
     BEAM_MMISSILE,                //    and similarly irresistible things
     BEAM_FIRE,
     BEAM_COLD,
-    BEAM_MAGIC,                   //  5
+    BEAM_MAGIC,
     BEAM_ELECTRICITY,
     BEAM_POISON,
     BEAM_NEG,
     BEAM_ACID,
-    BEAM_MIASMA,                  // 10
+    BEAM_MIASMA,
 
     BEAM_SPORE,
     BEAM_POISON_ARROW,
     BEAM_HELLFIRE,
     BEAM_NAPALM,
-    BEAM_STEAM,                   // 15
+    BEAM_STEAM,
     BEAM_HELLFROST,
     BEAM_ENERGY,
-    BEAM_HOLY,                    //   aka beam of cleansing, golden flame
+    BEAM_HOLY,
     BEAM_FRAG,
-    BEAM_LAVA,                    // 20
+    BEAM_LAVA,
     BEAM_BACKLIGHT,
     BEAM_SLEEP,
     BEAM_ICE,
     BEAM_NUKE,
     BEAM_RANDOM,                  // 25 - currently translates into FIRE..ACID
 
-    // These used to be handled in the colour field:
-    BEAM_SLOW,                  // BLACK
-    BEAM_HASTE,                 // BLUE
-    BEAM_HEALING,               // GREEN
-    BEAM_PARALYSIS,             // CYAN
-    BEAM_CONFUSION,             // RED - 30
-    BEAM_INVISIBILITY,          // MAGENTA
-    BEAM_DIGGING,               // BROWN
-    BEAM_TELEPORT,              // LIGHTGREY
-    BEAM_POLYMORPH,             // DARKGREY
-    BEAM_CHARM,                 // LIGHTBLUE - 35
-    BEAM_BANISH,                // LIGHTGREEN
-    BEAM_DEGENERATE,            // LIGHTCYAN
-    BEAM_ENSLAVE_UNDEAD,        // LIGHTRED
-    BEAM_PAIN,                  // LIGHTMAGENTA
-    BEAM_DISPEL_UNDEAD,         // YELLOW - 40
-    BEAM_DISINTEGRATION,        // WHITE
-    BEAM_ENSLAVE_DEMON,         // colour "16"
+    // Enchantments
+    BEAM_FIRST_ENCHANTMENT,
+    BEAM_SLOW = BEAM_FIRST_ENCHANTMENT,
+    BEAM_HASTE,
+    BEAM_HEALING,
+    BEAM_PARALYSIS,
+    BEAM_CONFUSION,
+    BEAM_INVISIBILITY,
+    BEAM_DIGGING,
+    BEAM_TELEPORT,
+    BEAM_POLYMORPH,
+    BEAM_CHARM,
+    BEAM_BANISH,
+    BEAM_DEGENERATE,
+    BEAM_ENSLAVE_UNDEAD,
+    BEAM_PAIN,
+    BEAM_DISPEL_UNDEAD,
+    BEAM_DISINTEGRATION,
+    BEAM_ENSLAVE_DEMON,
     BEAM_BLINK,
     BEAM_PETRIFY,
+    BEAM_LAST_ENCHANTMENT = BEAM_PETRIFY,
 
     // new beams for evaporate
-    BEAM_POTION_STINKING_CLOUD, // 45
+    BEAM_POTION_STINKING_CLOUD,
     BEAM_POTION_POISON,
     BEAM_POTION_MIASMA,
     BEAM_POTION_STEAM,
     BEAM_POTION_FIRE,
-    BEAM_POTION_COLD,           // 50
+    BEAM_POTION_COLD,
     BEAM_POTION_BLACK_SMOKE,
     BEAM_POTION_GREY_SMOKE,
     BEAM_POTION_BLUE_SMOKE,
     BEAM_POTION_PURP_SMOKE,
-    BEAM_POTION_RANDOM,         // 55
+    BEAM_POTION_RANDOM,
 
     BEAM_TORMENT_DAMAGE,        // Pseudo-beam for damage flavour.