[Refactor] #37353 コメント整理。 / Refactor comments.

[hengband/hengband.git] / src / monster-process.c

diff --git a/src/monster-process.c b/src/monster-process.c
index 735dc68..676f759 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -17,6 +17,10 @@
 #include "cmd-pet.h"
 #include "monsterrace-hook.h"
 #include "melee.h"
+#include "projection.h"
+#include "spells-summon.h"
+#include "quest.h"
+#include "avatar.h"
 
 
 /*!
@@ -193,7 +197,7 @@ static bool get_enemy_dir(MONSTER_IDX m_idx, int *mm)
  * @param who 打撃を行ったモンスターの参照ID
  * @return なし
  */
-void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, cptr note, IDX who)
+void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, IDX who)
 {
        monster_type *m_ptr = &m_list[m_idx];
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
@@ -1477,7 +1481,7 @@ static bool monst_attack_monst(MONSTER_IDX m_idx, MONSTER_IDX t_idx)
                HIT_POINT power = 0;
                HIT_POINT damage = 0;
 
-               cptr act = NULL;
+               concptr act = NULL;
 
                /* Extract the attack infomation */
                int effect = r_ptr->blow[ap_cnt].effect;
@@ -2374,9 +2378,9 @@ void process_monster(MONSTER_IDX m_idx)
                                        DEPTH rlev = ((r_ptr->level >= 1) ? r_ptr->level : 1);
                                        BIT_FLAGS p_mode = is_pet(m_ptr) ? PM_FORCE_PET : 0L;
 
-                                       for (k = 0; k < 6; k++)
+                                       for (k = 0; k < A_MAX; k++)
                                        {
-                                               if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_MOLD, (PM_ALLOW_GROUP | p_mode)))
+                                               if (summon_specific(m_idx, m_ptr->fy, m_ptr->fx, rlev, SUMMON_MOLD, (PM_ALLOW_GROUP | p_mode), '\0'))
                                                {
                                                        if (m_list[hack_m_idx_ii].ml) count++;
                                                }
@@ -2407,7 +2411,7 @@ void process_monster(MONSTER_IDX m_idx)
                {
                        GAME_TEXT m_name[MAX_NLEN];
                        char monmessage[1024];
-                       cptr filename;
+                       concptr filename;
 
                        /* Acquire the monster name/poss */
                        if (m_ptr->ml)
@@ -3040,8 +3044,6 @@ void process_monster(MONSTER_IDX m_idx)
                        else
                        {
                                /* sound(SOUND_WALK); */
-
-                               /* Move the player */
                                if (!move_player_effect(ny, nx, MPE_DONT_PICKUP)) break;
                        }