Remove unused SPELL_DISRUPT and ZAP_DISRUPTION.

5 files changed, 1 insertions, 28 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index bbc0993942..be571cd77d 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -4365,7 +4365,7 @@ static void _compile_time_asserts()
     COMPILE_CHECK(SK_EVOCATIONS == 39           , c2);
     COMPILE_CHECK(SP_VAMPIRE == 30              , c3);
     COMPILE_CHECK(SPELL_DEBUGGING_RAY == 103    , c4);
-    COMPILE_CHECK(SPELL_PETRIFY == 156          , c5);
+    COMPILE_CHECK(SPELL_PETRIFY == 155          , c5);
     COMPILE_CHECK(NUM_SPELLS == 206             , c6);
 
     //jmf: NEW ASSERTS: we ought to do a *lot* of these
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index db560d139e..97cf158970 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1081,23 +1081,6 @@ const zap_info zap_data[] = {
         0
     },
 
-
-    {
-        ZAP_DISRUPTION,
-        "0",
-        100,
-        new dicedef_calculator<1, 4, 1, 5>,
-        new tohit_calculator<0, 3, 1>,
-        BLACK,
-        true,
-        BEAM_DISINTEGRATION,
-        DCHAR_SPACE,
-        false,
-        false,
-        false,
-        6 // XXX: How loud is disintigration?
-    },
-
     {
         ZAP_DISINTEGRATION,
         "0",
@@ -3149,8 +3132,6 @@ bool bolt::affects_wall(dungeon_feature_type wall) const
     if (flavour == BEAM_DIGGING)
         return (true);
 
-    // FIXME: There should be a better way to test for ZAP_DISRUPTION
-    // vs. ZAP_DISINTEGRATION.
     if (flavour == BEAM_DISINTEGRATION && damage.num >= 3)
         return (true);
 
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 34379be929..8229e7aa17 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2812,7 +2812,6 @@ enum spell_type
     SPELL_PORTAL,
     SPELL_AGONY,
     SPELL_SPIDER_FORM,
-    SPELL_DISRUPT,
     SPELL_DISINTEGRATE,
     SPELL_BLADE_HANDS,
     SPELL_STATUE_FORM,
@@ -3126,7 +3125,6 @@ enum zap_type
     ZAP_BREATHE_POWER,
     ZAP_ENSLAVE_UNDEAD,
     ZAP_AGONY,
-    ZAP_DISRUPTION,
     ZAP_DISINTEGRATION,
     ZAP_BREATHE_STEAM,
     ZAP_CONTROL_DEMON,
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index b67846757c..18a84c5e5a 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1479,11 +1479,6 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_DISRUPT:
-        if (!zapping(ZAP_DISRUPTION, powc, beam, true))
-            return (SPRET_ABORT);
-        break;
-
     case SPELL_DISINTEGRATE:
         if (!zapping(ZAP_DISINTEGRATION, powc, beam, true))
             return (SPRET_ABORT);
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index ff8af3482d..17dab2ff75 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2932,7 +2932,6 @@ int tileidx_spell(spell_type spell)
     // Spells that don't need icons:
     case SPELL_STONEMAIL:     // Xom only?
     case SPELL_SUMMON_DRAGON: // Xom
-    case SPELL_DISRUPT:       // in development?
     case SPELL_DISINTEGRATE:  // wand and card
 
     // Monster spells (mostly?)