From 5bea4d013197ca276fbeb267ac9fc3fd2f37450c Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 10 Jan 2008 14:20:47 +0000
Subject: More resist fixes.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3242 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/enum.h | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'crawl-ref/source/enum.h')

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 2d571f028b..a0a33036a3 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -184,31 +184,33 @@ enum attribute_type
 
 enum beam_type                  // beam[].flavour
 {
-    BEAM_MISSILE,                 //    0
-    BEAM_MMISSILE,                //    1 - and similarly unresistable things
+    BEAM_NONE,                    //    0
+    
+    BEAM_MISSILE,
+    BEAM_MMISSILE,                //    and similarly irresistible things
     BEAM_FIRE,
     BEAM_COLD,
     BEAM_MAGIC,
-    BEAM_ELECTRICITY,             //    5
+    BEAM_ELECTRICITY,
     BEAM_POISON,
     BEAM_NEG,
     BEAM_ACID,
     BEAM_MIASMA,
-    // BEAM_EXPLOSION,            //   10 - use is_explosion, and BEAM of flavour
-    BEAM_SPORE = 11,
+
+    BEAM_SPORE,
     BEAM_POISON_ARROW,
     BEAM_HELLFIRE,
     BEAM_NAPALM,
-    BEAM_STEAM,                   //   15
+    BEAM_STEAM,
     BEAM_HELLFROST,
     BEAM_ENERGY,
-    BEAM_HOLY,                    //   18 - aka beam of cleansing, golden flame
+    BEAM_HOLY,                    //   aka beam of cleansing, golden flame
     BEAM_FRAG,
-    BEAM_LAVA,                    //   20
+    BEAM_LAVA,
     BEAM_BACKLIGHT,
     BEAM_SLEEP,
-    BEAM_ICE,                     //   23
-    BEAM_NUKE = 27,               //   27
+    BEAM_ICE,
+    BEAM_NUKE,
     BEAM_RANDOM,                  //   currently translates into FIRE..ACID
 
     // These used to be handled in the colour field:
-- 
cgit v1.2.3-54-g00ecf