Consolide the two spell_type headers

1 files changed, 83 insertions, 1 deletions

diff --git a/src/spell_type.hpp b/src/spell_type.hpp
index 1817e6a8..db0b2409 100644
--- a/src/spell_type.hpp
+++ b/src/spell_type.hpp
@@ -1,7 +1,89 @@
 #pragma once
 
-#include "spell_type_fwd.h"
+#include "spell_type_fwd.hpp"
 #include <string>
 #include <functional>
+#include "h-basic.h"
+#include "types_fwd.h"
+#include "device_allocation_fwd.h"
+#include "range_fwd.h"
 
+/*
+ * Casting type
+ */
+enum casting_type { USE_SPELL_POINTS, USE_PIETY };
+
+/*
+ * Does the spell appear on spell random books?
+ */
+enum random_type { RANDOM, NO_RANDOM };
+
+/*
+ * Spell functions
+ */
+
+void spell_type_init_music(spell_type *spell,
+			   s16b minimum_pval,
+			   const char* (*info_func)(),
+			   casting_result (*effect_func)(int o_idx));
+void spell_type_init_music_lasting(spell_type *spell,
+				   s16b minimum_pval,
+				   const char* (*info_func)(),
+				   casting_result (*effect_func)(int o_idx),
+				   int (*lasting_func)());
+void spell_type_init_mage(spell_type *spell,
+			  random_type random_type,
+			  s32b school_idx,
+			  const char* (*info_func)(),
+			  casting_result (*effect_func)(int o_idx));
+void spell_type_init_priest(spell_type *spell,
+			    s32b school_idx,
+			    const char* (*info_func)(),
+			    casting_result (*effect_func)(int o_idx));
+void spell_type_init_device(spell_type *spell,
+			    const char* (*info_func)(),
+			    casting_result (*effect_func)(int o_idx));
+void spell_type_init_demonology(spell_type *spell,
+				const char* (*info_func)(),
+				casting_result (*effect_func)(int o_idx));
+void spell_type_init_geomancy(spell_type *spell,
+			      const char* (*info_func)(),
+			      casting_result (*effect_func)(int o_idx),
+			      bool_ (*depend_func)());
+
+void spell_type_set_activation_timeout(spell_type *spell, cptr timeout_s);
+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_add_school(spell_type *spell, s32b school_idx);
+
+void spell_type_set_device_charges(spell_type *spell, cptr charges_s);
+void spell_type_add_device_allocation(spell_type *spell, device_allocation *a);
+
+spell_type *spell_type_new(cptr name);
+
+int spell_type_produce_effect_lasting(spell_type *spell);
+casting_result spell_type_produce_effect(spell_type *spell, int o_idx);
+cptr spell_type_name(spell_type *spell);
+int spell_type_skill_level(spell_type *spell);
+long spell_type_roll_charges(spell_type *spell);
+void spell_type_activation_description(spell_type *spell, char *buf);
+int spell_type_activation_roll_timeout(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);
+s16b spell_type_minimum_pval(spell_type *spell);
+s16b spell_type_random_type(spell_type *spell);
+bool_ spell_type_school_foreach(spell_type *spell, bool_ (*callback)(void *data, s32b school_idx), void *data);
+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);
+void spell_type_mana_range(spell_type *spell, struct range_type *range);
+bool_ spell_type_dependencies_satisfied(spell_type *spell);
 void spell_type_description_foreach(spell_type *spell, std::function<void (std::string const &text)>);