1 files changed, 21 insertions, 21 deletions

diff --git a/src/spell_type.hpp b/src/spell_type.hpp
index 43758103..4519832b 100644
--- a/src/spell_type.hpp
+++ b/src/spell_type.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 #include <functional>
-#include "h-basic.h"
+#include "h-basic.hpp"
 #include "device_allocation_fwd.hpp"
 #include "range_fwd.hpp"
 
@@ -24,63 +24,63 @@ enum random_type { RANDOM, NO_RANDOM };
 
 void spell_type_init_music(spell_type *spell,
 			   s16b minimum_pval,
-			   const char* (*info_func)(),
+			   std::string (*info_func)(),
 			   casting_result (*effect_func)());
 void spell_type_init_music_lasting(spell_type *spell,
 				   s16b minimum_pval,
-				   const char* (*info_func)(),
+				   std::string (*info_func)(),
 				   casting_result (*effect_func)(),
 				   int (*lasting_func)());
 void spell_type_init_mage(spell_type *spell,
 			  random_type random_type,
 			  s32b school_idx,
-			  const char* (*info_func)(),
+			  std::string (*info_func)(),
 			  casting_result (*effect_func)());
 void spell_type_init_priest(spell_type *spell,
 			    s32b school_idx,
-			    const char* (*info_func)(),
+			    std::string (*info_func)(),
 			    casting_result (*effect_func)());
 void spell_type_init_device(spell_type *spell,
-			    const char* (*info_func)(),
+			    std::string (*info_func)(),
 			    casting_result (*effect_func)());
 void spell_type_init_demonology(spell_type *spell,
-				const char* (*info_func)(),
+				std::string (*info_func)(),
 				casting_result (*effect_func)());
 void spell_type_init_geomancy(spell_type *spell,
-			      const char* (*info_func)(),
+			      std::string (*info_func)(),
 			      casting_result (*effect_func)(),
-			      bool_ (*depend_func)());
+			      bool (*depend_func)());
 
 void spell_type_set_inertia(spell_type *spell, s32b difficulty, s32b delay);
 void spell_type_set_difficulty(spell_type *spell, byte skill_level, s32b failure_rate);
 void spell_type_set_mana(spell_type *spell, s32b min, s32b max);
-void spell_type_set_castable_while_blind(spell_type *spell, bool_ value);
-void spell_type_set_castable_while_confused(spell_type *spell, bool_ value);
-void spell_type_describe(spell_type *spell, cptr line);
+void spell_type_set_castable_while_blind(spell_type *spell, bool value);
+void spell_type_set_castable_while_confused(spell_type *spell, bool value);
+void spell_type_describe(spell_type *spell, const char *line);
 
 void spell_type_add_school(spell_type *spell, s32b school_idx);
 
-void spell_type_set_device_charges(spell_type *spell, cptr charges_s);
+void spell_type_set_device_charges(spell_type *spell, const char *charges_s);
 void spell_type_add_device_allocation(spell_type *spell, device_allocation *a);
 
-spell_type *spell_type_new(cptr name);
+spell_type *spell_type_new(const char *name);
 
 int spell_type_produce_effect_lasting(spell_type *spell);
 casting_result spell_type_produce_effect(spell_type *spell);
-cptr spell_type_name(spell_type *spell);
+const char *spell_type_name(spell_type *spell);
 int spell_type_skill_level(spell_type *spell);
 long spell_type_roll_charges(spell_type *spell);
 struct device_allocation *spell_type_device_allocation(spell_type *spell, byte tval);
-bool_ spell_type_uses_piety_to_cast(spell_type *spell);
-bool_ spell_type_castable_while_blind(spell_type *spell);
-bool_ spell_type_castable_while_confused(spell_type *spell);
+bool spell_type_uses_piety_to_cast(spell_type *spell);
+bool spell_type_castable_while_blind(spell_type *spell);
+bool spell_type_castable_while_confused(spell_type *spell);
 s16b spell_type_minimum_pval(spell_type *spell);
 s16b spell_type_random_type(spell_type *spell);
 std::vector<s32b> const spell_type_get_schools(spell_type *spell);
-bool_ spell_type_inertia(spell_type *spell, s32b *difficulty, s32b *delay);
+bool spell_type_inertia(spell_type *spell, s32b *difficulty, s32b *delay);
 s32b spell_type_failure_rate(spell_type *spell);
 s16b spell_type_casting_stat(spell_type *spell);
-cptr spell_type_info(spell_type *spell);
+std::string spell_type_info(spell_type *spell);
 void spell_type_mana_range(spell_type *spell, struct range_type *range);
-bool_ spell_type_dependencies_satisfied(spell_type *spell);
+bool spell_type_dependencies_satisfied(spell_type *spell);
 void spell_type_description_foreach(spell_type *spell, std::function<void (std::string const &text)>);