[Refactor] #40030 Moved update_player_window() from monster-process.c to monster...

diff --git a/src/monster-process.c b/src/monster-process.c
index d990dd8..a3e946e 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -87,7 +87,6 @@ bool process_monster_fear(player_type *target_ptr, turn_flags *turn_flags_ptr, M
 void sweep_monster_process(player_type *target_ptr);
 bool decide_process_continue(player_type *target_ptr, monster_type *m_ptr);
 SPEED decide_monster_speed(player_type *target_ptr, monster_type *m_ptr, int monster_number);
-void update_player_window(player_type *target_ptr, old_race_flags *old_race_flags_ptr);
 
 /*!
  * @brief モンスターが敵に接近するための方向を計算するメインルーチン
@@ -2156,7 +2155,7 @@ void process_monsters(player_type *target_ptr)
        if (!target_ptr->monster_race_idx || (target_ptr->monster_race_idx != old_monster_race_idx))
                return;
 
-       update_player_window(target_ptr, old_race_flags_ptr);
+       update_player_window(target_ptr->monster_race_idx, &target_ptr->window, old_race_flags_ptr);
 }
 
 
@@ -2256,31 +2255,3 @@ SPEED decide_monster_speed(player_type *target_ptr, monster_type *m_ptr, int mon
 
        return speed;
 }
-
-
-/*!
- * @brief モンスターフラグの更新に基づき、モンスター表示を更新する
- * @param target_ptr プレーヤーへの参照ポインタ
- * @param old_race_flags_ptr モンスターフラグへの参照ポインタ
- * @return なし
- */
-void update_player_window(player_type *target_ptr, old_race_flags *old_race_flags_ptr)
-{
-       monster_race *r_ptr;
-       r_ptr = &r_info[target_ptr->monster_race_idx];
-       if ((old_race_flags_ptr->old_r_flags1 != r_ptr->r_flags1) ||
-               (old_race_flags_ptr->old_r_flags2 != r_ptr->r_flags2) ||
-               (old_race_flags_ptr->old_r_flags3 != r_ptr->r_flags3) ||
-               (old_race_flags_ptr->old_r_flags4 != r_ptr->r_flags4) ||
-               (old_race_flags_ptr->old_r_flags5 != r_ptr->r_flags5) ||
-               (old_race_flags_ptr->old_r_flags6 != r_ptr->r_flags6) ||
-               (old_race_flags_ptr->old_r_flagsr != r_ptr->r_flagsr) ||
-               (old_race_flags_ptr->old_r_blows0 != r_ptr->r_blows[0]) ||
-               (old_race_flags_ptr->old_r_blows1 != r_ptr->r_blows[1]) ||
-               (old_race_flags_ptr->old_r_blows2 != r_ptr->r_blows[2]) ||
-               (old_race_flags_ptr->old_r_blows3 != r_ptr->r_blows[3]) ||
-               (old_race_flags_ptr->old_r_cast_spell != r_ptr->r_cast_spell))
-       {
-               target_ptr->window |= (PW_MONSTER);
-       }
-}

diff --git a/src/monster/monster-util.c b/src/monster/monster-util.c
index d67ac1d..3744016 100644 (file)
--- a/src/monster/monster-util.c
+++ b/src/monster/monster-util.c
@@ -160,3 +160,32 @@ void save_old_race_flags(MONRACE_IDX monster_race_idx, old_race_flags *old_race_
 
        old_race_flags_ptr->old_r_cast_spell = r_ptr->r_cast_spell;
 }
+
+
+/*!
+ * @brief モンスターフラグの更新に基づき、モンスター表示を更新する
+ * @param monster_race_idx モンスターID
+ * @param window ウィンドウフラグ
+ * @param old_race_flags_ptr モンスターフラグへの参照ポインタ
+ * @return なし
+ */
+void update_player_window(MONRACE_IDX monster_race_idx, BIT_FLAGS *window, old_race_flags *old_race_flags_ptr)
+{
+       monster_race *r_ptr;
+       r_ptr = &r_info[monster_race_idx];
+       if ((old_race_flags_ptr->old_r_flags1 != r_ptr->r_flags1) ||
+               (old_race_flags_ptr->old_r_flags2 != r_ptr->r_flags2) ||
+               (old_race_flags_ptr->old_r_flags3 != r_ptr->r_flags3) ||
+               (old_race_flags_ptr->old_r_flags4 != r_ptr->r_flags4) ||
+               (old_race_flags_ptr->old_r_flags5 != r_ptr->r_flags5) ||
+               (old_race_flags_ptr->old_r_flags6 != r_ptr->r_flags6) ||
+               (old_race_flags_ptr->old_r_flagsr != r_ptr->r_flagsr) ||
+               (old_race_flags_ptr->old_r_blows0 != r_ptr->r_blows[0]) ||
+               (old_race_flags_ptr->old_r_blows1 != r_ptr->r_blows[1]) ||
+               (old_race_flags_ptr->old_r_blows2 != r_ptr->r_blows[2]) ||
+               (old_race_flags_ptr->old_r_blows3 != r_ptr->r_blows[3]) ||
+               (old_race_flags_ptr->old_r_cast_spell != r_ptr->r_cast_spell))
+       {
+               *window |= (PW_MONSTER);
+       }
+}

diff --git a/src/monster/monster-util.h b/src/monster/monster-util.h
index 0678e62..0c66fdc 100644 (file)
--- a/src/monster/monster-util.h
+++ b/src/monster/monster-util.h
@@ -54,3 +54,4 @@ coordinate_candidate init_coordinate_candidate(void);
 
 void store_enemy_approch_direction(int *mm, POSITION y, POSITION x);
 void save_old_race_flags(MONRACE_IDX monster_race_idx, old_race_flags *old_race_flags_ptr);
+void update_player_window(MONRACE_IDX monster_race_idx, BIT_FLAGS *window, old_race_flags *old_race_flags_ptr);