s/portaled/portal

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

8 files changed, 17 insertions, 17 deletions

diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt
index 0c6ae8dc1d..260dd97757 100644
--- a/crawl-ref/source/dat/descript/spells.txt
+++ b/crawl-ref/source/dat/descript/spells.txt
@@ -471,7 +471,7 @@ Portal
 
 This spell creates a gate allowing long-distance travel in relatively ordinary environments (i.e., the Dungeon only). The portal lasts long enough for the caster and nearby creatures to enter. Casters are never taken past the level limits of the current area. 
 %%%%
-Portaled Projectile
+Portal Projectile
 
 This spell teleports a fired or thrown missile directly to its target, greatly increasing its accuracy (but not damage).
 %%%%
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 269a706212..6ede219e63 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2483,7 +2483,7 @@ enum spell_type
     SPELL_CONJURE_BALL_LIGHTNING,
     SPELL_CHAIN_LIGHTNING,
     SPELL_EXCRUCIATING_WOUNDS,
-    SPELL_PORTALED_PROJECTILE,
+    SPELL_PORTAL_PROJECTILE,
 
     // Mostly monster-only spells after this point:
     SPELL_HELLFIRE_BURST,             // 205
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index cb5ed26aae..8c3b8b7f81 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -2241,7 +2241,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
         pbolt.damage.size += ammoDamBonus + lnchDamBonus;
     }
 
-    // Add in bonus (only from Portaled Projectile for now)
+    // Add in bonus (only from Portal Projectile for now)
     if (acc_bonus != DEBUG_COOKIE)
         pbolt.hit += acc_bonus;
 
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 7b7c053c71..7c90d3f8d2 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -2745,7 +2745,7 @@ void cast_twist(int pow)
     return;
 }                               // end cast_twist()
 
-bool cast_portaled_projectile(int pow, bolt& beam)
+bool cast_portal_projectile(int pow, bolt& beam)
 {
     if ( pow > 50 )
         pow = 50;
diff --git a/crawl-ref/source/spells4.h b/crawl-ref/source/spells4.h
index 4a0b745d05..55535bf37a 100644
--- a/crawl-ref/source/spells4.h
+++ b/crawl-ref/source/spells4.h
@@ -62,6 +62,6 @@ void cast_shuggoth_seed(int powc);
 void make_shuggoth(int x, int y, int hp);
 
 int cast_semi_controlled_blink(int pow);
-bool cast_portaled_projectile(int pow, bolt& beam);
+bool cast_portal_projectile(int pow, bolt& beam);
 
 #endif
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 3e4383ce88..dde0b1420d 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -161,7 +161,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
      },
     // 11 - Book of Spatial Translocations
     {SPELL_APPORTATION,
-     SPELL_PORTALED_PROJECTILE,
+     SPELL_PORTAL_PROJECTILE,
      SPELL_BLINK,
      SPELL_RECALL,
      SPELL_TELEPORT_OTHER,
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 81498eda49..2769e17e99 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -882,7 +882,7 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
              testbits( flags, SPFLAG_DIR )    ? DIR_DIR    : DIR_NONE);
 
         const char *prompt = get_spell_target_prompt(spell);
-        if (spell == SPELL_PORTALED_PROJECTILE)
+        if (spell == SPELL_PORTAL_PROJECTILE)
         {
             const int idx = get_fire_item_index();
             if ( idx == ENDOFPACK )
@@ -1881,8 +1881,8 @@ spret_type your_spells( spell_type spell, int powc, bool allow_fail )
             return (SPRET_ABORT);
         break;
 
-    case SPELL_PORTALED_PROJECTILE:
-        if ( !cast_portaled_projectile(powc, beam) )
+    case SPELL_PORTAL_PROJECTILE:
+        if ( !cast_portal_projectile(powc, beam) )
             return SPRET_ABORT;
         break;
 
diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
index c50c5e40da..99b5ed5d7e 100644
--- a/crawl-ref/source/spl-data.h
+++ b/crawl-ref/source/spl-data.h
@@ -2160,14 +2160,14 @@
 },
 
 {
-    SPELL_PORTALED_PROJECTILE, "Portaled Projectile",
-        SPTYP_TRANSLOCATION,
-        SPFLAG_TARGET,
-        2,
-        50,
-        NULL,
-        false,
-        false
+    SPELL_PORTAL_PROJECTILE, "Portal Projectile",
+    SPTYP_TRANSLOCATION,
+    SPFLAG_TARGET,
+    2,
+    50,
+    NULL,
+    false,
+    false
 },
 
 {