[Refactor] #define ALLOW_EASY_OPEN による分岐処理削除。 / Delete #define branch by ALLOW_EASY_OPEN.

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

diff --git a/src/monster2.c b/src/monster2.c
index b6ad372..1f82bb3 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -476,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 */
@@ -1891,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);
        }
 
@@ -1937,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);
        }
 }
@@ -1978,7 +1976,6 @@ 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 */
 
                if (is_pet(m_ptr))
                        return; /* Pet eldritch horrors are safe most of the time */
@@ -2981,10 +2978,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,
@@ -3598,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);
 }
 
@@ -3730,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座標
@@ -3800,9 +3792,6 @@ bool alloc_horde(POSITION y, POSITION x)
        return TRUE;
 }
 
-#endif /* MONSTER_HORDES */
-
-
 /*!
  * @brief ダンジョンの主生成を試みる / Put the Guardian
  * @param def_val 現在の主の生成状態
@@ -3893,7 +3882,6 @@ bool alloc_monster(POSITION dis, BIT_FLAGS mode)
        }
 
 
-#ifdef MONSTER_HORDES
        if (randint1(5000) <= dun_level)
        {
                if (alloc_horde(y, x))
@@ -3904,16 +3892,10 @@ 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 */
 
-       /* Nope */
        return (FALSE);
 }
 
@@ -4460,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)