[Refactor] #39076 /* Check for quest completion */ と /* Reset sleep counter */ を削除。

diff --git a/src/monster-process.c b/src/monster-process.c
index 532088c..cb478bf 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -2252,11 +2252,8 @@ void process_monster(MONSTER_IDX m_idx)
                                        msg_print(_("地面に落とされた。", "You have fallen from riding pet."));
                                }
 
-                               /* Check for quest completion */
                                check_quest_completion(m_ptr);
-
                                delete_monster_idx(m_idx);
-
                                return;
                        }
                }
@@ -2273,7 +2270,6 @@ void process_monster(MONSTER_IDX m_idx)
                /* Handle non-aggravation - Still sleeping */
                if (!(p_ptr->cursed & TRC_AGGRAVATE)) return;
 
-               /* Reset sleep counter */
                (void)set_monster_csleep(m_idx, 0);
 
                /* Notice the "waking up" */
@@ -2309,8 +2305,7 @@ void process_monster(MONSTER_IDX m_idx)
 
        /* Paranoia... no pet uniques outside wizard mode -- TY */
        if (is_pet(m_ptr) && ((((r_ptr->flags1 & RF1_UNIQUE) || (r_ptr->flags7 & RF7_NAZGUL)) &&
-             monster_has_hostile_align(NULL, 10, -10, r_ptr))
-            || (r_ptr->flagsr & RFR_RES_ALL)))
+             monster_has_hostile_align(NULL, 10, -10, r_ptr)) || (r_ptr->flagsr & RFR_RES_ALL)))
        {
                gets_angry = TRUE;
        }

diff --git a/src/monster1.c b/src/monster1.c
index 417afa7..582b354 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -2221,7 +2221,6 @@ void set_friendly(monster_type *m_ptr)
  */
 void set_pet(monster_type *m_ptr)
 {
-       /* Check for quest completion */
        check_quest_completion(m_ptr);
 
        m_ptr->smart |= SM_PET;
@@ -2588,7 +2587,6 @@ void monster_death(MONSTER_IDX m_idx, bool drop_item)
                r_ptr = &r_info[m_ptr->r_idx];
        }
 
-       /* Check for quest completion */
        check_quest_completion(m_ptr);
 
        /* Handle the possibility of player vanquishing arena combatant -KMW- */

diff --git a/src/spells3.c b/src/spells3.c
index 5885af8..2f8d6a2 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -729,7 +729,6 @@ void teleport_level(MONSTER_IDX m_idx)
        {
                monster_type *m_ptr = &current_floor_ptr->m_list[m_idx];
 
-               /* Check for quest completion */
                check_quest_completion(m_ptr);
 
                if (record_named_pet && is_pet(m_ptr) && m_ptr->nickname)
@@ -1258,7 +1257,6 @@ static bool vanish_dungeon(void)
                        /* Awake monster */
                        if (g_ptr->m_idx && MON_CSLEEP(m_ptr))
                        {
-                               /* Reset sleep counter */
                                (void)set_monster_csleep(g_ptr->m_idx, 0);
 
                                /* Notice the "waking up" */