[Refactor] #37353 ALLOW_FEARのプリプロが有効であることを前提とし、プリプロ自体は削除 / Removed ALLOW_FEAR but...

diff --git a/src/combat/melee1.c b/src/combat/melee1.c
index 9cb38e8..9984ac1 100644 (file)
--- a/src/combat/melee1.c
+++ b/src/combat/melee1.c
@@ -4858,8 +4858,6 @@ void mon_take_hit_mon(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam,
 
        *dead = FALSE;
 
-#ifdef ALLOW_FEAR
-
        /* Mega-Hack -- Pain cancels fear */
        if (MON_MONFEAR(m_ptr) && (dam > 0))
        {
@@ -4894,8 +4892,6 @@ void mon_take_hit_mon(player_type *player_ptr, MONSTER_IDX m_idx, HIT_POINT dam,
                }
        }
 
-#endif /* ALLOW_FEAR */
-
        if ((dam > 0) && !is_pet(m_ptr) && !is_friendly(m_ptr) && (who != m_idx))
        {
                if (is_pet(&floor_ptr->m_list[who]) && !player_bold(player_ptr, m_ptr->target_y, m_ptr->target_x))

diff --git a/src/h-config.h b/src/h-config.h
index 797c6ad..4448687 100644 (file)
--- a/src/h-config.h
+++ b/src/h-config.h
@@ -446,12 +446,6 @@
  */
 #define ALLOW_AUTOROLLER
 
-/*!
- * @brief 一定以上のダメージを受けたモンスターが恐怖して逃走する / OPTION: Allow monsters to "flee" when hit hard
- */
-#define ALLOW_FEAR
-
-
  /*
  * OPTION: Handle signals
  */

diff --git a/src/monster-status.c b/src/monster-status.c
index 13e2977..94907ae 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1411,8 +1411,6 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo
                return TRUE;
        }
 
-#ifdef ALLOW_FEAR
-
        /* Mega-Hack -- Pain cancels fear */
        if (MON_MONFEAR(m_ptr) && (dam > 0))
        {
@@ -1446,12 +1444,11 @@ bool mon_take_hit(player_type *target_ptr, MONSTER_IDX m_idx, HIT_POINT dam, boo
                }
        }
 
-#endif
-
        /* Not dead yet */
        return FALSE;
 }
 
+
 bool monster_is_valid(monster_type *m_ptr)
 {
        return (m_ptr->r_idx != 0);