[Refactor] #37353 have_nightmare() 関数を monsterace-hook.c に移動。 / Move have_nightmare...

diff --git a/src/bldg.c b/src/bldg.c
index 81edb2d..8e191b7 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -1930,25 +1930,6 @@ static bool kankin(void)
 }
 
 /*!
- * @brief 悪夢の元凶となるモンスターかどうかを返す。
- * @param r_idx 判定対象となるモンスターのＩＤ
- * @return 悪夢の元凶となり得るか否か。
- */
-bool get_nightmare(MONRACE_IDX r_idx)
-{
-       monster_race *r_ptr = &r_info[r_idx];
-
-       /* Require eldritch horrors */
-       if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return (FALSE);
-
-       /* Require high level */
-       if (r_ptr->level <= p_ptr->lev) return (FALSE);
-
-       /* Accept this monster */
-       return (TRUE);
-}
-
-/*!
  * @brief 宿屋の利用サブルーチン
  * @details inn commands\n
  * Note that resting for the night was a perfect way to avoid player\n

diff --git a/src/externs.h b/src/externs.h
index b5dde24..b0b2ba1 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -1069,7 +1069,6 @@ extern bool eat_lock(void);
 extern bool shock_power(void);
 
 /* bldg.c */
-extern bool get_nightmare(MONRACE_IDX r_idx);
 extern void battle_monsters(void);
 extern void do_cmd_bldg(void);
 extern void do_cmd_quest(void);

diff --git a/src/monsterrace-hook.c b/src/monsterrace-hook.c
index 8114411..b211eff 100644 (file)
--- a/src/monsterrace-hook.c
+++ b/src/monsterrace-hook.c
@@ -679,3 +679,22 @@ bool monster_hook_human(MONRACE_IDX r_idx)
 
        return FALSE;
 }
+
+/*!
+ * @brief 悪夢の元凶となるモンスターかどうかを返す。
+ * @param r_idx 判定対象となるモンスターのＩＤ
+ * @return 悪夢の元凶となり得るか否か。
+ */
+bool get_nightmare(MONRACE_IDX r_idx)
+{
+       monster_race *r_ptr = &r_info[r_idx];
+
+       /* Require eldritch horrors */
+       if (!(r_ptr->flags2 & (RF2_ELDRITCH_HORROR))) return (FALSE);
+
+       /* Require high level */
+       if (r_ptr->level <= p_ptr->lev) return (FALSE);
+
+       /* Accept this monster */
+       return (TRUE);
+}

diff --git a/src/monsterrace-hook.h b/src/monsterrace-hook.h
index 656e249..7f43685 100644 (file)
--- a/src/monsterrace-hook.h
+++ b/src/monsterrace-hook.h
@@ -61,3 +61,4 @@ extern bool vault_aux_dark_elf(MONRACE_IDX r_idx);
 extern bool monster_living(MONRACE_IDX r_idx);\r
 extern bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx);\r
 extern bool monster_hook_human(MONRACE_IDX r_idx);\r
+extern bool get_nightmare(MONRACE_IDX r_idx);\r