[Refactor] #37353 earthquake_aux() と earthquake() を統合．

[hengband/hengband.git] / src / spells3.c

diff --git a/src/spells3.c b/src/spells3.c
index ee7b648..9b8b74b 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -13,10 +13,16 @@
 
 #include "angband.h"
 #include "bldg.h"
+#include "core.h"
+#include "term.h"
 #include "util.h"
+#include "object-ego.h"
+
+#include "creature.h"
 
 #include "dungeon.h"
 #include "floor.h"
+#include "floor-town.h"
 #include "object-boost.h"
 #include "object-flavor.h"
 #include "object-hook.h"
@@ -24,6 +30,7 @@
 #include "player-move.h"
 #include "player-status.h"
 #include "player-class.h"
+#include "player-damage.h"
 #include "spells-summon.h"
 #include "quest.h"
 #include "artifact.h"
@@ -35,16 +42,20 @@
 #include "monster-status.h"
 #include "monster-spell.h"
 #include "cmd-spell.h"
+#include "cmd-dump.h"
 #include "snipe.h"
 #include "floor-save.h"
 #include "files.h"
 #include "player-effects.h"
 #include "player-skill.h"
+#include "player-personality.h"
 #include "view-mainwindow.h"
 #include "mind.h"
 #include "wild.h"
 #include "world.h"
 #include "objectkind.h"
+#include "autopick.h"
+#include "targeting.h"
 
 
 /*! テレポート先探索の試行数 / Maximum number of tries for teleporting */
@@ -3251,7 +3262,6 @@ static MONRACE_IDX poly_r_idx(MONRACE_IDX r_idx)
                /* Handle failure */
                if (!r) break;
 
-               /* Obtain race */
                r_ptr = &r_info[r];
 
                /* Ignore unique monsters */
@@ -3515,8 +3525,6 @@ bool eat_magic(int power)
                                        object_type forge;
                                        object_type *q_ptr;
                                        q_ptr = &forge;
-
-                                       /* Obtain a local object */
                                        object_copy(q_ptr, o_ptr);
 
                                        /* Modify quantity */
@@ -3912,7 +3920,7 @@ void blood_curse_to_enemy(MONSTER_IDX m_idx)
                        if (!count)
                        {
                                msg_print(_("地面が揺れた...", "The ground trembles..."));
-                               earthquake(m_ptr->fy, m_ptr->fx, 4 + randint0(4));
+                               earthquake(m_ptr->fy, m_ptr->fx, 4 + randint0(4), 0);
                                if (!one_in_(6)) break;
                        }
                case 3: case 4: case 5: case 6:
@@ -3951,7 +3959,7 @@ void blood_curse_to_enemy(MONSTER_IDX m_idx)
                        if (pet) mode |= PM_FORCE_PET;
                        else mode |= (PM_NO_PET | PM_FORCE_FRIENDLY);
 
-                       count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev * 2 / 3 + randint1(p_ptr->lev / 2) : current_floor_ptr->dun_level), 0, mode, '\0');
+                       count += summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, (pet ? p_ptr->lev * 2 / 3 + randint1(p_ptr->lev / 2) : current_floor_ptr->dun_level), 0, mode);
                        if (!one_in_(6)) break;
                }
                case 23: case 24: case 25: