Rename "Fling Icicle" to "Throw Icicle".

13 files changed, 16 insertions, 16 deletions

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 129ea8b59a..88b1be7cba 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -1102,7 +1102,7 @@ const zap_info zap_data[] = {
     },
 
     {
-        ZAP_FLING_ICICLE,
+        ZAP_THROW_ICICLE,
         "shard of ice",
         100,
         new calcdice_calculator<3, 10, 1, 2>,
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index b1d4cae35b..0da4437bb1 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -286,7 +286,7 @@ Hellfire
 
 This spell should only be available from Dispater's staff. So how are you reading this?
 %%%%
-Fling Icicle
+Throw Icicle
 
 This spell throws forth a shard of ice. It is particularly effective against those creatures not immune to the effects of freezing. But as most of its destructive potential comes from strong impact and cutting edges, even cold-resistant creatures are notably affected.
 %%%%
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 93928809d6..038045d191 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1631,7 +1631,7 @@ static bool _damaging_card(card_type card, int power, deck_rarity_type rarity)
     dist target;
     zap_type ztype = ZAP_DEBUGGING_RAY;
     const zap_type firezaps[3]   = { ZAP_FLAME, ZAP_STICKY_FLAME, ZAP_FIRE };
-    const zap_type frostzaps[3]  = { ZAP_FROST, ZAP_FLING_ICICLE, ZAP_COLD };
+    const zap_type frostzaps[3]  = { ZAP_FROST, ZAP_THROW_ICICLE, ZAP_COLD };
     const zap_type hammerzaps[3] = { ZAP_STRIKING, ZAP_STONE_ARROW,
                                      ZAP_CRYSTAL_SPEAR };
     const zap_type venomzaps[3]  = { ZAP_STING, ZAP_VENOM_BOLT,
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 9c043e8335..ab634b6a2d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2841,7 +2841,7 @@ enum spell_type
     SPELL_DEATH_CHANNEL,
     SPELL_SYMBOL_OF_TORMENT,           //  120
     SPELL_DEFLECT_MISSILES,
-    SPELL_FLING_ICICLE,
+    SPELL_THROW_ICICLE,
     SPELL_ICE_STORM,
     SPELL_AIRSTRIKE,
     SPELL_SHADOW_CREATURES,            //  125
@@ -3145,7 +3145,7 @@ enum zap_type
     ZAP_BREATHE_STEAM,
     ZAP_CONTROL_DEMON,
     ZAP_ORB_OF_FRAGMENTATION,
-    ZAP_FLING_ICICLE,
+    ZAP_THROW_ICICLE,
     ZAP_ICE_STORM,
     ZAP_BACKLIGHT,
     ZAP_SLEEP,
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 33a86ca592..e0bba5daf3 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2060,7 +2060,7 @@ static inline int get_resistible_fraction(beam_type flavour)
 {
     switch (flavour)
     {
-    // Assume ice storm and fling icicle are mostly solid.
+    // Assume ice storm and throw icicle are mostly solid.
     case BEAM_ICE:
         return (25);
 
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 5735eb9134..60362b318a 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -50,7 +50,7 @@ static spell_type search_order_conj[] = {
     SPELL_ISKENDERUNS_MYSTIC_BLAST,
 // 10
     SPELL_BOLT_OF_MAGMA,
-    SPELL_FLING_ICICLE,
+    SPELL_THROW_ICICLE,
     SPELL_BOLT_OF_FIRE,
     SPELL_BOLT_OF_COLD,
     SPELL_FIREBALL,
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc
index 1524d0cb44..619e719d2e 100644
--- a/crawl-ref/source/mon-cast.cc
+++ b/crawl-ref/source/mon-cast.cc
@@ -234,7 +234,7 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power )
         beam.is_beam  = true;
         break;
 
-    case SPELL_FLING_ICICLE:
+    case SPELL_THROW_ICICLE:
         beam.name     = "shard of ice";
         beam.damage   = dice_def( 3, 8 + power / 11 );
         beam.colour   = WHITE;
diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h
index 88a1612db7..9f0fd017e1 100644
--- a/crawl-ref/source/mon-spll.h
+++ b/crawl-ref/source/mon-spll.h
@@ -959,7 +959,7 @@
     {  MST_ICE_STATUE,
       {
        SPELL_BOLT_OF_COLD,
-       SPELL_FLING_ICICLE,
+       SPELL_THROW_ICICLE,
        SPELL_NO_SPELL,
        SPELL_FREEZING_CLOUD,
        SPELL_SUMMON_ICE_BEAST,
diff --git a/crawl-ref/source/rltiles/dc-spells.txt b/crawl-ref/source/rltiles/dc-spells.txt
index 00453962c7..8dbf264f4e 100644
--- a/crawl-ref/source/rltiles/dc-spells.txt
+++ b/crawl-ref/source/rltiles/dc-spells.txt
@@ -94,7 +94,7 @@ ensorcelled_hibernation ENSORCELLED_HIBERNATION
 freeze FREEZE
 freezing_aura FREEZING_AURA
 freezing_cloud FREEZING_CLOUD
-fling_icicle FLING_ICICLE
+throw_icicle THROW_ICICLE
 ice_form ICE_FORM
 ice_storm ICE_STORM
 metabolic_englaciation METABOLIC_ENGLACIATION
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 869d872b94..0b095e471d 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -125,7 +125,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
     {SPELL_FREEZE,
      SPELL_THROW_FROST,
      SPELL_OZOCUBUS_ARMOUR,
-     SPELL_FLING_ICICLE,
+     SPELL_THROW_ICICLE,
      SPELL_SUMMON_ICE_BEAST,
      SPELL_FREEZING_CLOUD,
      SPELL_NO_SPELL,
@@ -643,7 +643,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] =
 
     // 53 - Rod of destruction (ice)
     {SPELL_THROW_FROST,
-     SPELL_FLING_ICICLE,
+     SPELL_THROW_ICICLE,
      SPELL_FREEZING_CLOUD,
      SPELL_NO_SPELL,
      SPELL_NO_SPELL,
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 79fefc24f6..8b15d1f54b 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -1483,8 +1483,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
             return (SPRET_ABORT);
         break;
 
-    case SPELL_FLING_ICICLE:
-        if (!zapping(ZAP_FLING_ICICLE, powc, beam, true))
+    case SPELL_THROW_ICICLE:
+        if (!zapping(ZAP_THROW_ICICLE, powc, beam, true))
             return (SPRET_ABORT);
         break;
 
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index 16b519d997..bdb7fd197b 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -1663,7 +1663,7 @@
 },
 
 {
-    SPELL_FLING_ICICLE, "Fling Icicle",
+    SPELL_THROW_ICICLE, "Throw Icicle",
      SPTYP_CONJURATION | SPTYP_ICE,
      SPFLAG_DIR_OR_TARGET,
      4,
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 775f51b939..9394bbd88c 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -2793,7 +2793,7 @@ int tileidx_spell(spell_type spell)
     case SPELL_FREEZING_AURA:            return TILEG_FREEZING_AURA;
     case SPELL_SLEEP:                    return TILEG_ENSORCELLED_HIBERNATION;
     case SPELL_OZOCUBUS_ARMOUR:          return TILEG_OZOCUBUS_ARMOUR;
-    case SPELL_FLING_ICICLE:             return TILEG_FLING_ICICLE;
+    case SPELL_THROW_ICICLE:             return TILEG_THROW_ICICLE;
     case SPELL_CONDENSATION_SHIELD:      return TILEG_CONDENSATION_SHIELD;
     case SPELL_OZOCUBUS_REFRIGERATION:   return TILEG_OZOCUBUS_REFRIGERATION;
     case SPELL_BOLT_OF_COLD:             return TILEG_BOLT_OF_COLD;