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

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

diff --git a/src/monster2.c b/src/monster2.c
index 6e01834..38a07a6 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -266,8 +266,6 @@ void delete_monster_idx(MONSTER_IDX i)
        for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -278,7 +276,6 @@ void delete_monster_idx(MONSTER_IDX i)
                 * to prevent calling lite_spot()
                 */
 
-               /* Delete the object */
                delete_object_idx(this_o_idx);
        }
 
@@ -355,8 +352,6 @@ static void compact_monsters_aux(IDX i1, IDX i2)
        for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
                object_type *o_ptr;
-
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
@@ -471,12 +466,10 @@ void compact_monsters(int size)
                        if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
                        {
                                char m_name[80];
-
                                monster_desc(m_name, m_ptr, MD_INDEF_VISIBLE);
                                do_cmd_write_nikki(NIKKI_NAMED_PET, RECORD_NAMED_PET_COMPACT, m_name);
                        }
 
-
                        delete_monster_idx(i);
 
                        /* Count the monster */
@@ -590,7 +583,6 @@ MONSTER_IDX m_pop(void)
 {
        MONSTER_IDX i;
 
-
        /* Normal allocation */
        if (m_max < max_m_idx)
        {
@@ -607,7 +599,6 @@ MONSTER_IDX m_pop(void)
                return (i);
        }
 
-
        /* Recycle dead monsters */
        for (i = 1; i < m_max; i++)
        {
@@ -626,7 +617,6 @@ MONSTER_IDX m_pop(void)
                return (i);
        }
 
-
        /* Warn the player (except during dungeon creation) */
        if (character_dungeon) msg_print(_("モンスターが多すぎる！", "Too many monsters!"));
 
@@ -954,8 +944,6 @@ static bool summon_specific_aux(MONRACE_IDX r_idx)
                        break;
                }
        }
-
-       /* Result */
        /* Since okay is int, "return (okay);" is not correct. */
        return (bool)(okay ? TRUE : FALSE);
 }
@@ -1447,8 +1435,6 @@ MONRACE_IDX get_mon_num(DEPTH level)
                /* Keep the "best" one */
                if (table[i].level < table[j].level) i = j;
        }
-
-       /* Result */
        return (table[i].index);
 }
 
@@ -1976,6 +1962,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;
 
                if (is_pet(m_ptr))
                        return; /* Pet eldritch horrors are safe most of the time */
@@ -2291,7 +2278,7 @@ void sanity_blast(monster_type *m_ptr, bool necro)
  * "disturb_near" (monster which is "easily" viewable moves in some
  * way).  Note that "moves" includes "appears" and "disappears".
  */
-void update_mon(MONSTER_IDX m_idx, bool full)
+void update_monster(MONSTER_IDX m_idx, bool full)
 {
        monster_type *m_ptr = &m_list[m_idx];
 
@@ -2610,7 +2597,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);
                        }
                }
        }
@@ -2635,7 +2622,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);
                        }
                }
        }
@@ -2654,7 +2641,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);
                        }
                }
        }
@@ -2672,7 +2659,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);
                        }
                }
        }
@@ -2695,9 +2682,7 @@ void update_monsters(bool full)
 
                /* Skip dead monsters */
                if (!m_ptr->r_idx) continue;
-
-               /* Update the monster */
-               update_mon(i, full);
+               update_monster(i, full);
        }
 }
 
@@ -2830,7 +2815,7 @@ void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx)
 
        m_ptr->r_idx = r_idx;
        m_ptr->ap_r_idx = r_idx;
-       update_mon(m_idx, FALSE);
+       update_monster(m_idx, FALSE);
        lite_spot(m_ptr->fy, m_ptr->fx);
 
        if ((r_info[old_r_idx].flags7 & (RF7_LITE_MASK | RF7_DARK_MASK)) ||
@@ -3089,7 +3074,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;
@@ -3277,9 +3261,7 @@ static bool place_monster_one(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I
                p_ptr->update |= (PU_MON_LITE);
        else if ((r_ptr->flags7 & RF7_HAS_LD_MASK) && !MON_CSLEEP(m_ptr))
                p_ptr->update |= (PU_MON_LITE);
-
-       /* Update the monster */
-       update_mon(c_ptr->m_idx, TRUE);
+       update_monster(c_ptr->m_idx, TRUE);
 
 
        /* Count the monsters on the level */
@@ -3729,9 +3711,6 @@ bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode)
        return (FALSE);
 }
 
-
-#ifdef MONSTER_HORDES
-
 /*!
  * @brief 指定地点に1種類のモンスター種族による群れを生成する
  * @param y 生成地点y座標
@@ -3795,9 +3774,6 @@ bool alloc_horde(POSITION y, POSITION x)
        return TRUE;
 }
 
-#endif /* MONSTER_HORDES */
-
-
 /*!
  * @brief ダンジョンの主生成を試みる / Put the Guardian
  * @param def_val 現在の主の生成状態
@@ -3888,7 +3864,6 @@ bool alloc_monster(POSITION dis, BIT_FLAGS mode)
        }
 
 
-#ifdef MONSTER_HORDES
        if (randint1(5000) <= dun_level)
        {
                if (alloc_horde(y, x))
@@ -3899,14 +3874,9 @@ bool alloc_monster(POSITION 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 */
 
        return (FALSE);
 }
@@ -4583,13 +4553,10 @@ void monster_drop_carried_objects(monster_type *m_ptr)
        /* Drop objects being carried */
        for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
        {
-               /* Acquire object */
                o_ptr = &o_list[this_o_idx];
 
                /* Acquire next object */
                next_o_idx = o_ptr->next_o_idx;
-
-               /* Get local object */
                q_ptr = &forge;
 
                /* Copy the object */
@@ -4598,7 +4565,6 @@ void monster_drop_carried_objects(monster_type *m_ptr)
                /* Forget monster */
                q_ptr->held_m_idx = 0;
 
-               /* Delete the object */
                delete_object_idx(this_o_idx);
 
                /* Drop it */