[Refactor] #38997 PRACE_IS_ マクロに player_type の引数を追加．

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

diff --git a/src/realm-nature.c b/src/realm-nature.c
index c31c896..0fa2e46 100644 (file)
--- a/src/realm-nature.c
+++ b/src/realm-nature.c
@@ -1,10 +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"
 
 
 /*!
@@ -115,7 +122,7 @@ 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_(p_ptr, RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE)) && !p_ptr->resist_lite)
                                {
                                        msg_print(_("日の光があなたの肉体を焦がした！", "The daylight scorches your flesh!"));
                                        take_hit(DAMAGE_NOESCAPE, damroll(2, 2), _("日の光", "daylight"), -1);
@@ -294,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, p_ptr->y, p_ptr->x, plev, SUMMON_ANIMAL_RANGER, (PM_ALLOW_GROUP | PM_FORCE_PET))))
                                {
                                        msg_print(_("動物は現れなかった。", "No animals arrive."));
                                }
@@ -434,7 +441,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
 
                        if (cast)
                        {
-                               earthquake(p_ptr->y, p_ptr->x, rad);
+                               earthquake(p_ptr->y, p_ptr->x, rad, 0);
                        }
                }
                break;
@@ -519,7 +526,7 @@ concptr do_nature_spell(SPELL_IDX spell, BIT_FLAGS mode)
                                chg_virtue(V_ENLIGHTEN, 1);
                                wiz_lite(FALSE);
 
-                               if ((prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE)) && !p_ptr->resist_lite)
+                               if ((PRACE_IS_(p_ptr, RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE)) && !p_ptr->resist_lite)
                                {
                                        msg_print(_("日光があなたの肉体を焦がした！", "The sunlight scorches your flesh!"));
                                        take_hit(DAMAGE_NOESCAPE, 50, _("日光", "sunlight"), -1);
@@ -556,7 +563,7 @@ 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);
+                               earthquake(p_ptr->y, p_ptr->x, q_rad, 0);
                                project(0, b_rad, p_ptr->y, p_ptr->x, b_dam, GF_DISINTEGRATE, PROJECT_KILL | PROJECT_ITEM, -1);
                        }
                }