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

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

diff --git a/src/monster2.c b/src/monster2.c
index e6d20de..f60cf8f 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -11,6 +11,9 @@
  */
 
 #include "angband.h"
+#include "cmd-pet.h"
+#include "monster-hook.h"
+#include "monster-status.h"
 
 #define HORDE_NOGOOD 0x01 /*!< (未実装フラグ)HORDE生成でGOODなモンスターの生成を禁止する？ */
 #define HORDE_NOEVIL 0x02 /*!< (未実装フラグ)HORDE生成でEVILなモンスターの生成を禁止する？ */
@@ -169,7 +172,7 @@ cptr funny_comments[MAX_SAN_COMMENT] =
  * @param x 目標x座標
  * @return なし
  */
-void set_target(monster_type *m_ptr, int y, int x)
+void set_target(monster_type *m_ptr, POSITION y, POSITION x)
 {
        m_ptr->target_y = y;
        m_ptr->target_x = x;
@@ -221,20 +224,15 @@ monster_race *real_r_ptr(monster_type *m_ptr)
  */
 void delete_monster_idx(MONSTER_IDX i)
 {
-       int x, y;
-
+       POSITION x, y;
        monster_type *m_ptr = &m_list[i];
-
        monster_race *r_ptr = &r_info[m_ptr->r_idx];
-
-       s16b this_o_idx, next_o_idx = 0;
-
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        /* Get location */
        y = m_ptr->fy;
        x = m_ptr->fx;
 
-
        /* Hack -- Reduce the racial counter */
        real_r_ptr(m_ptr)->cur_num--;
 
@@ -332,23 +330,18 @@ void delete_monster(POSITION y, POSITION x)
  */
 static void compact_monsters_aux(IDX i1, IDX i2)
 {
-       int y, x, i;
-
+       POSITION y, x;
+       int i;
        cave_type *c_ptr;
-
        monster_type *m_ptr;
-
-       s16b this_o_idx, next_o_idx = 0;
-
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
 
        /* Do nothing */
        if (i1 == i2) return;
 
-
        /* Old monster */
        m_ptr = &m_list[i1];
 
-       /* Location */
        y = m_ptr->fy;
        x = m_ptr->fx;
 
@@ -483,7 +476,7 @@ void compact_monsters(int size)
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
                        }
 
-                       /* Delete the monster */
+
                        delete_monster_idx(i);
 
                        /* Count the monster */
@@ -1898,7 +1891,6 @@ int lore_do_probe(MONRACE_IDX r_idx)
        /* Update monster recall window */
        if (p_ptr->monster_race_idx == r_idx)
        {
-               /* Window stuff */
                p_ptr->window |= (PW_MONSTER);
        }
 
@@ -1944,7 +1936,6 @@ void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold
        /* Update monster recall window */
        if (p_ptr->monster_race_idx == m_ptr->r_idx)
        {
-               /* Window stuff */
                p_ptr->window |= (PW_MONSTER);
        }
 }
@@ -1985,7 +1976,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
                        return; /* Cannot see it for some reason */
 
                if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR))
-                       return; /* oops */
+                       return;
 
                if (is_pet(m_ptr))
                        return; /* Pet eldritch horrors are safe most of the time */
@@ -2620,7 +2611,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
                        if (disturb_near && (projectable(m_ptr->fy, m_ptr->fx, p_ptr->y, p_ptr->x) && projectable(p_ptr->y, p_ptr->x, m_ptr->fy, m_ptr->fx)))
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 1);
+                                       disturb(TRUE, TRUE);
                        }
                }
        }
@@ -2645,7 +2636,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 1);
+                                       disturb(TRUE, TRUE);
                        }
                }
        }
@@ -2664,7 +2655,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 1);
+                                       disturb(TRUE, TRUE);
                        }
                }
        }
@@ -2682,7 +2673,7 @@ void update_mon(MONSTER_IDX m_idx, bool full)
                        if (do_disturb)
                        {
                                if (disturb_pets || is_hostile(m_ptr))
-                                       disturb(1, 1);
+                                       disturb(TRUE, TRUE);
                        }
                }
        }
@@ -2810,7 +2801,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 
        if (!r_idx)
        {
-               int level;
+               DEPTH level;
 
                chameleon_change_m_idx = m_idx;
                if (old_unique)
@@ -2988,10 +2979,10 @@ byte get_mspeed(monster_race *r_ptr)
  *
  * This routine refuses to place out-of-depth "FORCE_DEPTH" monsters.
  *
- * XXX XXX XXX Use special "here" and "dead" flags for unique monsters,
+ * Use special "here" and "dead" flags for unique monsters,
  * remove old "cur_num" and "max_num" fields.
  *
- * XXX XXX XXX Actually, do something similar for artifacts, to simplify
+ * Actually, do something similar for artifacts, to simplify
  * the "preserve" mode, and to make the "what artifacts" flag more useful.
  *
  * This is the only function which may place a monster in the dungeon,
@@ -3099,7 +3090,6 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
                        c_ptr->info &= ~(CAVE_OBJECT);
                        c_ptr->mimic = 0;
 
-                       /* Notice */
                        note_spot(y, x);
                }
                else return FALSE;
@@ -3463,8 +3453,6 @@ static bool mon_scatter(MONRACE_IDX r_idx, POSITION *yp, POSITION *xp, POSITION
        return TRUE;
 }
 
-#define GROUP_MAX 32 /*!< place_monster_group() 関数によるモンスターのGROUP生成時の配置最大数 / Maximum size of a group of monsters */
-
 /*!
  * @brief モンスターを目標地点に集団生成する / Attempt to place a "group" of monsters around the given location
  * @param who 召喚主のモンスター情報ID
@@ -3607,7 +3595,6 @@ static bool place_monster_can_escort(MONRACE_IDX r_idx)
        if ((r_ptr->flags7 & RF7_CHAMELEON) && !(z_ptr->flags7 & RF7_CHAMELEON))
                return FALSE;
 
-       /* Okay */
        return (TRUE);
 }
 
@@ -3739,13 +3726,9 @@ bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode)
        /* Attempt to place the monster */
        if (place_monster_aux(0, y, x, r_idx, mode)) return (TRUE);
 
-       /* Oops */
        return (FALSE);
 }
 
-
-#ifdef MONSTER_HORDES
-
 /*!
  * @brief 指定地点に1種類のモンスター種族による群れを生成する
  * @param y 生成地点y座標
@@ -3809,9 +3792,6 @@ bool alloc_horde(POSITION y, POSITION x)
        return TRUE;
 }
 
-#endif /* MONSTER_HORDES */
-
-
 /*!
  * @brief ダンジョンの主生成を試みる / Put the Guardian
  * @param def_val 現在の主の生成状態
@@ -3862,10 +3842,10 @@ bool alloc_guardian(bool def_val)
  * Use "slp" to choose the initial "sleep" status
  * Use "monster_level" for the monster level
  */
-bool alloc_monster(int dis, BIT_FLAGS mode)
+bool alloc_monster(POSITION dis, BIT_FLAGS mode)
 {
-       int                     y = 0, x = 0;
-       int         attempts_left = 10000;
+       int y = 0, x = 0;
+       int attempts_left = 10000;
 
        /* Put the Guardian */
        if (alloc_guardian(FALSE)) return TRUE;
@@ -3902,7 +3882,6 @@ bool alloc_monster(int dis, BIT_FLAGS mode)
        }
 
 
-#ifdef MONSTER_HORDES
        if (randint1(5000) <= dun_level)
        {
                if (alloc_horde(y, x))
@@ -3913,16 +3892,10 @@ bool alloc_monster(int dis, BIT_FLAGS mode)
        }
        else
        {
-#endif /* MONSTER_HORDES */
-
                /* Attempt to place the monster, allow groups */
                if (place_monster(y, x, (mode | PM_ALLOW_GROUP))) return (TRUE);
-
-#ifdef MONSTER_HORDES
        }
-#endif /* MONSTER_HORDES */
 
-       /* Nope */
        return (FALSE);
 }
 
@@ -3959,11 +3932,11 @@ static bool summon_specific_okay(MONRACE_IDX r_idx)
                }
        }
 
+       if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE;
+
        /* Hack -- no specific type specified */
        if (!summon_specific_type) return (TRUE);
 
-       if (!summon_unique_okay && ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL))) return FALSE;
-
        if ((summon_specific_who < 0) &&
            ((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) &&
            monster_has_hostile_align(NULL, 10, -10, r_ptr))
@@ -4047,6 +4020,7 @@ bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int t
 
        summon_specific_type = 0;
        /* Success */
+       sound(SOUND_SUMMON);
        return (TRUE);
 }
 
@@ -4468,7 +4442,6 @@ void update_smart_learn(MONSTER_IDX m_idx, int what)
        if (!(r_ptr->flags2 & (RF2_SMART)) && (randint0(100) < 50)) return;
 
 
-       /* XXX XXX XXX */
 
        /* Analyze the knowledge */
        switch (what)
@@ -4589,7 +4562,7 @@ bool player_place(POSITION y, POSITION x)
  */
 void monster_drop_carried_objects(monster_type *m_ptr)
 {
-       s16b this_o_idx, next_o_idx = 0;
+       OBJECT_IDX this_o_idx, next_o_idx = 0;
        object_type forge;
        object_type *o_ptr;
        object_type *q_ptr;