Decouple zap_type from wand_type prepatory to a big beam() rewrite.

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

1 files changed, 6 insertions, 9 deletions

diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h
index c31e9e11fa..65ff241f7b 100644
--- a/crawl-ref/source/itemprop.h
+++ b/crawl-ref/source/itemprop.h
@@ -535,32 +535,29 @@ enum vorpal_damage_type
     DAMV_MASK           = 0xf000        // strips non-vorpal specification
 };
 
-// NOTE:  This order is very special!  Its basically the same as ZAP_*,
-// and there are bits of the code that still use that fact.
-// See item_def::zap().
-enum wand_type                         // mitm[].subtype
+enum wand_type
 {
-    WAND_FLAME,                        //    0
+    WAND_FLAME,
     WAND_FROST,
     WAND_SLOWING,
     WAND_HASTING,
     WAND_MAGIC_DARTS,
-    WAND_HEALING,                      //    5
+    WAND_HEALING,
     WAND_PARALYSIS,
     WAND_FIRE,
     WAND_COLD,
     WAND_CONFUSION,
-    WAND_INVISIBILITY,                 //   10
+    WAND_INVISIBILITY,
     WAND_DIGGING,
     WAND_FIREBALL,
     WAND_TELEPORTATION,
     WAND_LIGHTNING,
-    WAND_POLYMORPH_OTHER,              //   15
+    WAND_POLYMORPH_OTHER,
     WAND_ENSLAVEMENT,
     WAND_DRAINING,
     WAND_RANDOM_EFFECTS,
     WAND_DISINTEGRATION,
-    NUM_WANDS                          // must remain last member {dlb}
+    NUM_WANDS
 };
 
 enum zap_count_type