[Refactor] #38997 select_floor_music() に player_type * 引数を追加． / Add player_type ...

[hengband/hengband.git] / src / realm-nature.c

diff --git a/src/realm-nature.c b/src/realm-nature.c
index 973e7dc..7b6216f 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -1,11 +1,17 @@
 #include "angband.h"
+#include "util.h"
+
 #include "cmd-spell.h"
-#include "projection.h"
+#include "spells.h"
 #include "spells-summon.h"
 #include "spells-status.h"
 #include "spells-object.h"
 #include "avatar.h"
 #include "spells-floor.h"
+#include "player-race.h"
+#include "player-effects.h"
+#include "player-damage.h"
+#include "targeting.h"
 
 
 /*!
@@ -14,7 +20,7 @@
 * @param mode 処理内容 (SPELL_NAME / SPELL_DESC / SPELL_INFO / SPELL_CAST)
 * @return SPELL_NAME / SPELL_DESC / SPELL_INFO 時には文字列ポインタを返す。SPELL_CAST時はNULL文字列を返す。
 */
-concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
+concptr do_nature_spell(player_type *caster_ptr, SPELL_IDX spell, BIT_FLAGS mode)
 {
        bool name = (mode == SPELL_NAME) ? TRUE : FALSE;
        bool desc = (mode == SPELL_DESC) ? TRUE : FALSE;
@@ -22,7 +28,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
        bool cast = (mode == SPELL_CAST) ? TRUE : FALSE;
 
        DIRECTION dir;
-       PLAYER_LEVEL plev = p_ptr->lev;
+       PLAYER_LEVEL plev = caster_ptr->lev;
 
        switch (spell)
        {
@@ -96,7 +102,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                object_prep(q_ptr, lookup_kind(TV_FOOD, SV_FOOD_RATION));
 
                                /* Drop the object from heaven */
-                               (void)drop_near(q_ptr, -1, p_ptr->y, p_ptr->x);
+                               (void)drop_near(q_ptr, -1, caster_ptr->y, caster_ptr->x);
                        }
                }
                break;
@@ -116,10 +122,10 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        {
                                lite_area(damroll(dice, sides), rad);
 
-                               if ((prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE)) && !p_ptr->resist_lite)
+                               if ((PRACE_IS_(caster_ptr, RACE_VAMPIRE) || (caster_ptr->mimic_form == MIMIC_VAMPIRE)) && !caster_ptr->resist_lite)
                                {
                                        msg_print(_("日の光があなたの肉体を焦がした！", "The daylight scorches your flesh!"));
-                                       take_hit(DAMAGE_NOESCAPE, damroll(2, 2), _("日の光", "daylight"), -1);
+                                       take_hit(caster_ptr, DAMAGE_NOESCAPE, damroll(2, 2), _("日の光", "daylight"), -1);
                                }
                        }
                }
@@ -155,9 +161,9 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_cold(randint1(base) + base, FALSE);
-                               set_oppose_fire(randint1(base) + base, FALSE);
-                               set_oppose_elec(randint1(base) + base, FALSE);
+                               set_oppose_cold(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_fire(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_elec(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -174,9 +180,9 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               hp_player(damroll(dice, sides));
-                               set_cut(0);
-                               set_poisoned(0);
+                               hp_player(caster_ptr, damroll(dice, sides));
+                               set_cut(caster_ptr,0);
+                               set_poisoned(caster_ptr, 0);
                        }
                }
                break;
@@ -295,7 +301,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        if (cast)
                        {
-                               if (!(summon_specific(-1, p_ptr->y, p_ptr->x, plev, SUMMON_ANIMAL_RANGER, (PM_ALLOW_GROUP | PM_FORCE_PET), '\0')))
+                               if (!(summon_specific(-1, caster_ptr->y, caster_ptr->x, plev, SUMMON_ANIMAL_RANGER, (PM_ALLOW_GROUP | PM_FORCE_PET))))
                                {
                                        msg_print(_("動物は現れなかった。", "No animals arrive."));
                                }
@@ -310,7 +316,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                {
                        int heal = 500;
                        if (info) return info_heal(0, 0, heal);
-                       if (cast) (void)cure_critical_wounds(heal);
+                       if (cast) (void)cure_critical_wounds(caster_ptr, heal);
                }
                break;
 
@@ -338,7 +344,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_shield(randint1(sides) + base, FALSE);
+                               set_shield(caster_ptr, randint1(sides) + base, FALSE);
                        }
                }
                break;
@@ -355,11 +361,11 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               set_oppose_acid(randint1(base) + base, FALSE);
-                               set_oppose_elec(randint1(base) + base, FALSE);
-                               set_oppose_fire(randint1(base) + base, FALSE);
-                               set_oppose_cold(randint1(base) + base, FALSE);
-                               set_oppose_pois(randint1(base) + base, FALSE);
+                               set_oppose_acid(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_elec(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_fire(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_cold(caster_ptr, randint1(base) + base, FALSE);
+                               set_oppose_pois(caster_ptr, randint1(base) + base, FALSE);
                        }
                }
                break;
@@ -435,7 +441,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               earthquake(p_ptr->y, p_ptr->x, rad);
+                               earthquake(caster_ptr->y, caster_ptr->x, rad, 0);
                        }
                }
                break;
@@ -516,14 +522,14 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        if (cast)
                        {
                                fire_ball(GF_LITE, 0, dam, rad);
-                               chg_virtue(V_KNOWLEDGE, 1);
-                               chg_virtue(V_ENLIGHTEN, 1);
-                               wiz_lite(FALSE);
+                               chg_virtue(caster_ptr, V_KNOWLEDGE, 1);
+                               chg_virtue(caster_ptr, V_ENLIGHTEN, 1);
+                               wiz_lite(p_ptr, FALSE);
 
-                               if ((prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE)) && !p_ptr->resist_lite)
+                               if ((PRACE_IS_(caster_ptr, RACE_VAMPIRE) || (caster_ptr->mimic_form == MIMIC_VAMPIRE)) && !caster_ptr->resist_lite)
                                {
                                        msg_print(_("日光があなたの肉体を焦がした！", "The sunlight scorches your flesh!"));
-                                       take_hit(DAMAGE_NOESCAPE, 50, _("日光", "sunlight"), -1);
+                                       take_hit(caster_ptr, DAMAGE_NOESCAPE, 50, _("日光", "sunlight"), -1);
                                }
                        }
                }
@@ -557,8 +563,8 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                        if (cast)
                        {
                                dispel_monsters(d_dam);
-                               earthquake(p_ptr->y, p_ptr->x, q_rad);
-                               project(0, b_rad, p_ptr->y, p_ptr->x, b_dam, GF_DISINTEGRATE, PROJECT_KILL | PROJECT_ITEM, -1);
+                               earthquake(caster_ptr->y, caster_ptr->x, q_rad, 0);
+                               project(0, b_rad, caster_ptr->y, caster_ptr->x, b_dam, GF_DISINTEGRATE, PROJECT_KILL | PROJECT_ITEM, -1);
                        }
                }
                break;