X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fspells-status.h;h=40e1c7f33d9aa53d4e1ebcc29cc04b979e56f770;hb=c03f84fdf708028c8fc3155142f511cb289bc70f;hp=a7c4d81df8967e95d42f340c008cd1ec356b4bde;hpb=e0586f66cb0bc4d08cc7d03be09b5c640bc44846;p=hengband%2Fhengband.git

diff --git a/src/spells-status.h b/src/spells-status.h
index a7c4d81df..40e1c7f33 100644
--- a/src/spells-status.h
+++ b/src/spells-status.h
@@ -1,28 +1,31 @@
-
-extern bool heal_monster(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
-extern bool speed_monster(player_type *caster_ptr, DIRECTION dir, int power);
-extern bool slow_monster(player_type *caster_ptr, DIRECTION dir, int power);
-extern bool sleep_monster(player_type *caster_ptr, DIRECTION dir, int power);
-extern bool stasis_monster(player_type *caster_ptr, DIRECTION dir);    /* Like sleep, affects undead as well */
-extern bool stasis_evil(player_type *caster_ptr, DIRECTION dir);    /* Like sleep, affects undead as well */
-extern bool confuse_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool stun_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool fear_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
-extern bool poly_monster(player_type *caster_ptr, DIRECTION dir, int power);
-extern bool clone_monster(player_type *caster_ptr, DIRECTION dir);
-extern bool time_walk(player_type *creature_ptr);
-extern void roll_hitdice(player_type *creature_ptr, SPOP_FLAGS options);
-extern bool_hack life_stream(player_type *creature_ptr, bool_hack message, bool_hack virtue_change);
-extern bool_hack heroism(player_type *creature_ptr, int base);
-extern bool_hack berserk(player_type *creature_ptr, int base);
-extern bool_hack cure_light_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides);
-extern bool_hack cure_serious_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides);
-extern bool_hack cure_critical_wounds(player_type *creature_ptr, HIT_POINT pow);
-extern bool_hack true_healing(player_type *creature_ptr, HIT_POINT pow);
-extern bool_hack restore_mana(player_type *creature_ptr, bool_hack magic_eater);
-extern bool restore_all_status(player_type *creature_ptr);
+#pragma once
 
-extern bool fishing(player_type *creature_ptr);
-extern bool cosmic_cast_off(player_type *creature_ptr, object_type *o_ptr);
-extern void apply_nexus(monster_type *m_ptr, player_type *target_ptr);
-extern void status_shuffle(player_type *creature_ptr);
+#include "spell/spells-util.h"
+
+bool heal_monster(player_type *caster_ptr, DIRECTION dir, HIT_POINT dam);
+bool speed_monster(player_type *caster_ptr, DIRECTION dir, int power);
+bool slow_monster(player_type *caster_ptr, DIRECTION dir, int power);
+bool sleep_monster(player_type *caster_ptr, DIRECTION dir, int power);
+bool stasis_monster(player_type *caster_ptr, DIRECTION dir);    /* Like sleep, affects undead as well */
+bool stasis_evil(player_type *caster_ptr, DIRECTION dir);    /* Like sleep, affects undead as well */
+bool confuse_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool stun_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool fear_monster(player_type *caster_ptr, DIRECTION dir, PLAYER_LEVEL plev);
+bool poly_monster(player_type *caster_ptr, DIRECTION dir, int power);
+bool clone_monster(player_type *caster_ptr, DIRECTION dir);
+bool time_walk(player_type *creature_ptr);
+void roll_hitdice(player_type *creature_ptr, spell_operation options);
+bool life_stream(player_type *creature_ptr, bool message, bool virtue_change);
+bool heroism(player_type *creature_ptr, int base);
+bool berserk(player_type *creature_ptr, int base);
+bool cure_light_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides);
+bool cure_serious_wounds(player_type *creature_ptr, DICE_NUMBER dice, DICE_SID sides);
+bool cure_critical_wounds(player_type *creature_ptr, HIT_POINT pow);
+bool true_healing(player_type *creature_ptr, HIT_POINT pow);
+bool restore_mana(player_type *creature_ptr, bool magic_eater);
+bool restore_all_status(player_type *creature_ptr);
+
+bool fishing(player_type *creature_ptr);
+bool cosmic_cast_off(player_type *creature_ptr, object_type *o_ptr);
+void apply_nexus(monster_type *m_ptr, player_type *target_ptr);
+void status_shuffle(player_type *creature_ptr);