4 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 0cc1233bae..376b73fffc 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -777,7 +777,7 @@ public:
 
     kill_category kill_alignment() const;
 
-    bool has_spell(int spell) const;
+    bool has_spell(spell_type spell) const;
 
     size_type transform_size(int psize = PSIZE_TORSO) const;
     std::string shout_verb() const;
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 6afceb60ae..ed2cf8fe19 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -25,7 +25,7 @@ std::vector<ghost_demon> ghosts;
    Order for looking for conjurations for the 1st & 2nd spell slots,
    when finding spells to be remembered by a player's ghost:
  */
-static int search_order_conj[] = {
+static spell_type search_order_conj[] = {
     SPELL_LEHUDIBS_CRYSTAL_SPEAR,
     SPELL_BOLT_OF_DRAINING,
     SPELL_AGONY,
@@ -56,7 +56,7 @@ static int search_order_conj[] = {
 /*
    Order for looking for summonings and self-enchants for the 3rd spell slot:
  */
-static int search_order_third[] = {
+static spell_type search_order_third[] = {
 /* 0 */
     SPELL_SYMBOL_OF_TORMENT,
     SPELL_SUMMON_GREATER_DEMON,
@@ -80,7 +80,7 @@ static int search_order_third[] = {
    go through conjs.
    Note: Dig must be in misc2 (5th) position to work.
  */
-static int search_order_misc[] = {
+static spell_type search_order_misc[] = {
 /* 0 */
     SPELL_AGONY,
     SPELL_BANISHMENT,
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index f2f69df1dc..827afc83ac 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -3955,7 +3955,7 @@ bool player_is_airborne(void)
     return you.airborne();
 }
 
-bool player_has_spell( int spell )
+bool player_has_spell( spell_type spell )
 {
     return you.has_spell(spell);
 }
@@ -5428,7 +5428,7 @@ bool player::submerged() const
     return (false);
 }
 
-bool player::has_spell(int spell) const
+bool player::has_spell(spell_type spell) const
 {
     for (int i = 0; i < 25; i++)
     {
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index b066a1b515..6d5c0baf3e 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -434,7 +434,7 @@ void dec_disease_player();
 
 bool rot_player( int amount );
 
-bool player_has_spell( int spell );
+bool player_has_spell( spell_type spell );
 size_type player_size( int psize = PSIZE_TORSO, bool base = false );
 
 bool player_weapon_wielded();