[Refactor] #37353 monster_race_track() と object__race_track() を view-mainwindow.c...

diff --git a/src/bldg.c b/src/bldg.c
index bd84380..f744b53 100644 (file)
--- a/src/bldg.c
+++ b/src/bldg.c
@@ -44,6 +44,7 @@
 #include "player-effects.h"
 #include "scores.h"
 #include "shoot.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief 闘技場のモンスターID及び報酬アイテムテーブル

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 5c026bf..114164f 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -34,6 +34,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "monster.h"
+#include "view-mainwindow.h"
 
 
 /*!

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index 35e573b..3d5706b 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -30,6 +30,7 @@
 #include "player-effects.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief

diff --git a/src/externs.h b/src/externs.h
index 4eea1a3..e296ef3 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -368,8 +368,6 @@ extern void update_flow(void);
 extern void update_smell(void);
 extern void cave_set_feat(POSITION y, POSITION x, FEAT_IDX feat);
 
-extern void monster_race_track(MONRACE_IDX r_idx);
-extern void object_kind_track(KIND_OBJECT_IDX k_idx);
 extern bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, POSITION y, POSITION x, BIT_FLAGS mode);
 extern bool cave_player_teleportable_bold(POSITION y, POSITION x, BIT_FLAGS mode);
 

diff --git a/src/grid.c b/src/grid.c
index e41d6d4..9ca30ce 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -2006,32 +2006,6 @@ bool is_explosive_rune_grid(grid_type *g_ptr)
                return FALSE;
 }
 
-
-/*
- * Hack -- track the given monster race
- */
-void monster_race_track(MONRACE_IDX r_idx)
-{
-       /* Save this monster ID */
-       p_ptr->monster_race_idx = r_idx;
-
-       p_ptr->window |= (PW_MONSTER);
-}
-
-
-
-/*
- * Hack -- track the given object kind
- */
-void object_kind_track(KIND_OBJECT_IDX k_idx)
-{
-       /* Save this monster ID */
-       p_ptr->object_kind_idx = k_idx;
-
-       p_ptr->window |= (PW_OBJECT);
-}
-
-
 /*!
 * @brief 指定されたマスがモンスターのテレポート可能先かどうかを判定する。
 * @param m_idx モンスターID

diff --git a/src/monster-status.c b/src/monster-status.c
index 4e1f45f..d025eaa 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -14,6 +14,7 @@
 #include "avatar.h"
 #include "files.h"
 #include "player-effects.h"
+#include "view-mainwindow.h"
 
 
 /*!

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index f41ed5e..7c1ec87 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -3854,3 +3854,27 @@ void prt_path(POSITION y, POSITION x)
                if (nx == x && ny == y) default_color = TERM_L_DARK;
        }
 }
+
+
+/*
+ * Hack -- track the given monster race
+ */
+void monster_race_track(MONRACE_IDX r_idx)
+{
+       /* Save this monster ID */
+       p_ptr->monster_race_idx = r_idx;
+
+       p_ptr->window |= (PW_MONSTER);
+}
+
+/*
+ * Hack -- track the given object kind
+ */
+void object_kind_track(KIND_OBJECT_IDX k_idx)
+{
+       /* Save this monster ID */
+       p_ptr->object_kind_idx = k_idx;
+
+       p_ptr->window |= (PW_OBJECT);
+}
+

diff --git a/src/view-mainwindow.h b/src/view-mainwindow.h
index a9a17c2..a82c483 100644 (file)
--- a/src/view-mainwindow.h
+++ b/src/view-mainwindow.h
@@ -14,3 +14,5 @@ extern concptr map_name(void);
 extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines);
 extern void move_cursor_relative(int row, int col);
 extern void prt_path(POSITION y, POSITION x);
+extern void monster_race_track(MONRACE_IDX r_idx);
+extern void object_kind_track(KIND_OBJECT_IDX k_idx);