Rename zap enums to those of their spells.

1 files changed, 21 insertions, 20 deletions

diff --git a/crawl-ref/source/spl-zap.cc b/crawl-ref/source/spl-zap.cc
index 5cc41fe778..9fb99c43dd 100644
--- a/crawl-ref/source/spl-zap.cc
+++ b/crawl-ref/source/spl-zap.cc
@@ -10,27 +10,27 @@ zap_type spell_to_zap(spell_type spell)
     switch (spell)
     {
     case SPELL_MAGIC_DART:
-        return ZAP_MAGIC_DARTS;
+        return ZAP_MAGIC_DART;
     case SPELL_STRIKING:
         return ZAP_STRIKING;
     case SPELL_FORCE_LANCE:
         return ZAP_FORCE_LANCE;
     case SPELL_THROW_FLAME:
-        return ZAP_FLAME;
+        return ZAP_THROW_FLAME;
     case SPELL_THROW_FROST:
-        return ZAP_FROST;
+        return ZAP_THROW_FROST;
     case SPELL_PAIN:
         return ZAP_PAIN;
     case SPELL_FLAME_TONGUE:
         return ZAP_FLAME_TONGUE;
     case SPELL_SHOCK:
-        return ZAP_ELECTRICITY;
+        return ZAP_SHOCK;
     case SPELL_STING:
         return ZAP_STING;
     case SPELL_BOLT_OF_FIRE:
-        return ZAP_FIRE;
+        return ZAP_BOLT_OF_FIRE;
     case SPELL_BOLT_OF_COLD:
-        return ZAP_COLD;
+        return ZAP_BOLT_OF_COLD;
     case SPELL_PRIMAL_WAVE:
         return ZAP_PRIMAL_WAVE;
     case SPELL_STONE_ARROW:
@@ -40,34 +40,35 @@ zap_type spell_to_zap(spell_type spell)
     case SPELL_IRON_SHOT:
         return ZAP_IRON_SHOT;
     case SPELL_LIGHTNING_BOLT:
-        return ZAP_LIGHTNING;
+        return ZAP_BOLT_OF_LIGHTNING;
     case SPELL_BOLT_OF_MAGMA:
-        return ZAP_MAGMA;
+        return ZAP_BOLT_OF_MAGMA;
     case SPELL_VENOM_BOLT:
         return ZAP_VENOM_BOLT;
     case SPELL_BOLT_OF_DRAINING:
         return ZAP_NEGATIVE_ENERGY;
     case SPELL_LEHUDIBS_CRYSTAL_SPEAR:
-        return ZAP_CRYSTAL_SPEAR;
+        return ZAP_LEHUDIBS_CRYSTAL_SPEAR;
     case SPELL_FIREBALL:
         return ZAP_FIREBALL;
     case SPELL_BOLT_OF_INACCURACY:
-        return ZAP_BEAM_OF_ENERGY;
+        return ZAP_BOLT_OF_INACCURACY;
     case SPELL_STICKY_FLAME:
-    case SPELL_STICKY_FLAME_RANGE:
         return ZAP_STICKY_FLAME;
+    case SPELL_STICKY_FLAME_RANGE:
+        return ZAP_STICKY_FLAME_RANGE;
     case SPELL_DISPEL_UNDEAD:
         return ZAP_DISPEL_UNDEAD;
     case SPELL_ISKENDERUNS_MYSTIC_BLAST:
-        return ZAP_MYSTIC_BLAST;
+        return ZAP_ISKENDERUNS_MYSTIC_BLAST;
     case SPELL_AGONY:
         return ZAP_AGONY;
     case SPELL_DISINTEGRATE:
-        return ZAP_DISINTEGRATION;
+        return ZAP_DISINTEGRATE;
     case SPELL_THROW_ICICLE:
         return ZAP_THROW_ICICLE;
     case SPELL_CIGOTUVIS_DEGENERATION:
-        return ZAP_DEGENERATION;
+        return ZAP_CIGOTUVIS_DEGENERATION;
     case SPELL_PORKALATOR:
         // Wizard mode only.
         return ZAP_PORKALATOR;
@@ -80,9 +81,9 @@ zap_type spell_to_zap(spell_type spell)
     case SPELL_CORONA:
         return ZAP_CORONA;
     case SPELL_SLOW:
-        return ZAP_SLOWING;
+        return ZAP_SLOW;
     case SPELL_CONFUSE:
-        return ZAP_CONFUSION;
+        return ZAP_CONFUSE;
     case SPELL_ENSLAVEMENT:
         return ZAP_ENSLAVEMENT;
     case SPELL_HIBERNATION:
@@ -90,21 +91,21 @@ zap_type spell_to_zap(spell_type spell)
     case SPELL_SLEEP:
         return ZAP_SLEEP;
     case SPELL_PARALYSE:
-        return ZAP_PARALYSIS;
+        return ZAP_PARALYSE;
     case SPELL_PETRIFY:
         return ZAP_PETRIFY;
     case SPELL_POLYMORPH_OTHER:
         return ZAP_POLYMORPH_OTHER;
     case SPELL_TELEPORT_OTHER:
-        return ZAP_TELEPORTATION;
+        return ZAP_TELEPORT_OTHER;
     case SPELL_INNER_FLAME:
         return ZAP_INNER_FLAME;
     case SPELL_HASTE:
-        return ZAP_HASTING;
+        return ZAP_HASTE;
     case SPELL_INVISIBILITY:
         return ZAP_INVISIBILITY;
     case SPELL_DIG:
-        return ZAP_DIGGING;
+        return ZAP_DIG;
     case SPELL_HOLY_LIGHT:
         return ZAP_HOLY_LIGHT;
     case SPELL_DEBUGGING_RAY: