Remove some vestiges of Ice Storm.

zap_type isn't marshalled anywhere, so doesn't need save compat.

3 files changed, 1 insertions, 45 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index c1f662c6ce..990cac45ce 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -459,14 +459,6 @@ void zappy(zap_type z_type, int power, bolt &pbolt)
     if (zinfo->damage)
         pbolt.damage = (*zinfo->damage)(power);
 
-#if TAG_MAJOR_VERSION == 34
-    if (z_type == ZAP_ICE_STORM)
-    {
-        pbolt.ench_power = power; // used for radius
-        pbolt.ex_size = power > 76 ? 3 : 2; // for tracer, overwritten later
-    }
-    else
-#endif
     if (z_type == ZAP_EXPLOSIVE_BOLT)
         pbolt.ench_power = power;
     else if (z_type == ZAP_BREATHE_FROST)
@@ -2640,8 +2632,7 @@ void bolt::affect_endpoint()
 
     // FIXME: why don't these just have is_explosion set?
     // They don't explode in tracers: why not?
-    if (name == "orb of electricity"
-       || name == "great blast of cold")
+    if (name == "orb of electricity")
     {
         target = pos();
         refine_for_explosion();
@@ -2896,9 +2887,6 @@ void bolt::affect_place_clouds()
         place_cloud(CLOUD_COLD, p, damage.num * damage.size / 30 + 1, agent());
     }
 
-    if (name == "great blast of cold")
-        place_cloud(CLOUD_COLD, p, random2(5) + 3, agent());
-
     if (name == "ball of steam")
         place_cloud(CLOUD_STEAM, p, random2(5) + 2, agent());
 
@@ -5916,17 +5904,6 @@ void bolt::refine_for_explosion()
         // Everything else is handled elsewhere...
     }
 
-    if (name == "great blast of cold")
-    {
-        seeMsg  = "The blast explodes into a great storm of ice!";
-        hearMsg = "You hear a raging storm!";
-
-        name       = "ice storm";
-        glyph      = dchar_glyph(DCHAR_FIRED_ZAP);
-        colour     = WHITE;
-        ex_size    = is_tracer ? 3 : (2 + (random2(ench_power) > 75));
-    }
-
     if (name == "stinking cloud")
     {
         seeMsg     = "The beam explodes into a vile cloud!";
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index e9c857b288..8752837214 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -4336,9 +4336,6 @@ enum zap_type
     ZAP_DISINTEGRATE,
     ZAP_BREATHE_STEAM,
     ZAP_THROW_ICICLE,
-#if TAG_MAJOR_VERSION == 34
-    ZAP_ICE_STORM,
-#endif
     ZAP_CORONA,
     ZAP_HIBERNATION,
     ZAP_FLAME_TONGUE,
diff --git a/crawl-ref/source/zap-data.h b/crawl-ref/source/zap-data.h
index 320c189f1d..d706bdc103 100644
--- a/crawl-ref/source/zap-data.h
+++ b/crawl-ref/source/zap-data.h
@@ -778,24 +778,6 @@ static const zap_info zap_data[] =
     4
 },
 
-#if TAG_MAJOR_VERSION == 34
-{                           // ench_power controls radius
-    ZAP_ICE_STORM,
-    "great blast of cold",
-    200,
-    new calcdice_calculator<7, 22, 1, 1>,
-    new tohit_calculator<20, 1, 10>,
-    BLUE,
-    false,
-    BEAM_ICE,
-    DCHAR_FIRED_ZAP,
-    true,
-    false,
-    true,
-    9 // XXX: Should a storm be louder?
-},
-#endif
-
 {
     ZAP_CORONA,
     "",