[Refactor] #40483 Moved *_track() from display-main-window.c/h to stuff-handler.c/h

diff --git a/src/cmd-action/cmd-attack.c b/src/cmd-action/cmd-attack.c
index 5991437..4d9a8f2 100644 (file)
--- a/src/cmd-action/cmd-attack.c
+++ b/src/cmd-action/cmd-attack.c
@@ -9,6 +9,7 @@
 #include "combat/attack-accuracy.h"
 #include "combat/attack-criticality.h"
 #include "core/asking-player.h"
+#include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "game-option/cheat-types.h"
@@ -30,7 +31,6 @@
 #include "player/player-skill.h"
 #include "spell/process-effect.h"
 #include "spell/spell-types.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 
 /*!

diff --git a/src/cmd-io/cmd-lore.c b/src/cmd-io/cmd-lore.c
index 8090544..50b2135 100644 (file)
--- a/src/cmd-io/cmd-lore.c
+++ b/src/cmd-io/cmd-lore.c
@@ -13,7 +13,6 @@
 #include "term/term-color-types.h"
 #include "util/int-char-converter.h"
 #include "util/string-processor.h"
-#include "view/display-main-window.h"
 #include "view/display-lore.h"
 
 /*!

diff --git a/src/core/stuff-handler.c b/src/core/stuff-handler.c
index 523af3a..8f5bacf 100644 (file)
--- a/src/core/stuff-handler.c
+++ b/src/core/stuff-handler.c
@@ -15,3 +15,36 @@ void handle_stuff(player_type* player_ptr)
     if (player_ptr->window)
         window_stuff(player_ptr);
 }
+
+/*
+ * Track the given monster race
+ */
+void monster_race_track(player_type *player_ptr, MONRACE_IDX r_idx)
+{
+    player_ptr->monster_race_idx = r_idx;
+    player_ptr->window |= (PW_MONSTER);
+}
+
+/*
+ * Track the given object kind
+ */
+void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx)
+{
+    player_ptr->object_kind_idx = k_idx;
+    player_ptr->window |= (PW_OBJECT);
+}
+
+/*
+ * Track a new monster
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @param m_idx トラッキング対象のモンスターID。0の時キャンセル
+ * @param なし
+ */
+void health_track(player_type *player_ptr, MONSTER_IDX m_idx)
+{
+    if (m_idx && m_idx == player_ptr->riding)
+        return;
+
+    player_ptr->health_who = m_idx;
+    player_ptr->redraw |= (PR_HEALTH);
+}

diff --git a/src/core/stuff-handler.h b/src/core/stuff-handler.h
index af59169..ba27a93 100644 (file)
--- a/src/core/stuff-handler.h
+++ b/src/core/stuff-handler.h
@@ -3,3 +3,6 @@
 #include "system/angband.h"
 
 void handle_stuff(player_type* player_ptr);
+void monster_race_track(player_type *player_ptr, MONRACE_IDX r_idx);
+void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx);
+void health_track(player_type *player_ptr, MONSTER_IDX m_idx);

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index aa401f0..ff6add5 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -30,7 +30,6 @@
 #include "util/angband-files.h"
 #include "util/int-char-converter.h"
 #include "util/string-processor.h"
-#include "view/display-main-window.h" // 暫定、後で消す.
 #include "view/display-lore.h"
 #include "view/display-monster-status.h"
 #include "world/world.h"

diff --git a/src/market/building-monster.c b/src/market/building-monster.c
index cec0517..2216b92 100644 (file)
--- a/src/market/building-monster.c
+++ b/src/market/building-monster.c
@@ -12,7 +12,6 @@
 #include "term/term-color-types.h"
 #include "util/int-char-converter.h"
 #include "util/string-processor.h"
-#include "view/display-main-window.h"
 #include "view/display-lore.h"
 
 /*!

diff --git a/src/monster-floor/monster-remover.c b/src/monster-floor/monster-remover.c
index bbd1c5e..8073187 100644 (file)
--- a/src/monster-floor/monster-remover.c
+++ b/src/monster-floor/monster-remover.c
@@ -1,4 +1,5 @@
 #include "monster-floor/monster-remover.h"
+#include "core/stuff-handler.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
@@ -10,7 +11,6 @@
 #include "monster/monster-info.h"
 #include "monster/monster-status.h"
 #include "system/monster-type-definition.h"
-#include "view/display-main-window.h"
 
 /*!
  * @brief モンスター配列からモンスターを消去する / Delete a monster by index.

diff --git a/src/monster/monster-compaction.c b/src/monster/monster-compaction.c
index ad709fa..16c7fd0 100644 (file)
--- a/src/monster/monster-compaction.c
+++ b/src/monster/monster-compaction.c
@@ -1,4 +1,5 @@
 #include "monster/monster-compaction.h"
+#include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"
 #include "grid/grid.h"
@@ -12,7 +13,6 @@
 #include "monster-floor/monster-remover.h"
 #include "monster/monster-status.h"
 #include "system/monster-type-definition.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 
 /*!

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 6d890b4..1870565 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -197,7 +197,6 @@
 #include "spell/spells3.h"
 #include "term/screen-processor.h"
 #include "util/bit-flags-calculator.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 #include "world/world.h"
 

diff --git a/src/player/player-status.c b/src/player/player-status.c
index e51942d..a046991 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -4015,6 +4015,34 @@ bool heavy_armor(player_type *creature_ptr)
        return (monk_arm_wgt > (100 + (creature_ptr->lev * 4)));
 }
 
+/*
+ * Delayed visual update
+ * Only used if update_view(), update_lite() or update_mon_lite() was called
+ */
+static void delayed_visual_update(player_type *player_ptr)
+{
+    floor_type *floor_ptr = player_ptr->current_floor_ptr;
+    for (int i = 0; i < floor_ptr->redraw_n; i++) {
+        POSITION y = floor_ptr->redraw_y[i];
+        POSITION x = floor_ptr->redraw_x[i];
+        grid_type *g_ptr;
+        g_ptr = &floor_ptr->grid_array[y][x];
+        if (!(g_ptr->info & CAVE_REDRAW))
+            continue;
+
+        if (g_ptr->info & CAVE_NOTE)
+            note_spot(player_ptr, y, x);
+
+        lite_spot(player_ptr, y, x);
+        if (g_ptr->m_idx)
+            update_monster(player_ptr, g_ptr->m_idx, FALSE);
+
+        g_ptr->info &= ~(CAVE_NOTE | CAVE_REDRAW);
+    }
+
+    floor_ptr->redraw_n = 0;
+}
+
 
 /*!
  * @brief update のフラグに応じた更新をまとめて行う / Handle "update"

diff --git a/src/spell/spells3.c b/src/spell/spells3.c
index 4e0f2b5..1410bac 100644 (file)
--- a/src/spell/spells3.c
+++ b/src/spell/spells3.c
@@ -99,7 +99,6 @@
 #include "term/term-color-types.h"
 #include "util/bit-flags-calculator.h"
 #include "util/int-char-converter.h"
-#include "view/display-main-window.h"
 #include "view/display-messages.h"
 #include "world/world.h"
 

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index de0a42b..06f52e4 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -231,21 +231,6 @@ void apply_default_feat_lighting(TERM_COLOR *f_attr, SYMBOL_CODE *f_char)
 }
 
 /*
- * Track a new monster
- * @param player_ptr プレーヤーへの参照ポインタ
- * @param m_idx トラッキング対象のモンスターID。0の時キャンセル
- * @param なし
- */
-void health_track(player_type *player_ptr, MONSTER_IDX m_idx)
-{
-    if (m_idx && m_idx == player_ptr->riding)
-        return;
-
-    player_ptr->health_who = m_idx;
-    player_ptr->redraw |= (PR_HEALTH);
-}
-
-/*
  * Moves the cursor to a given MAP (y,x) location
  */
 void move_cursor_relative(int row, int col)
@@ -316,53 +301,7 @@ void print_path(player_type *player_ptr, POSITION y, POSITION x)
 }
 
 /*
- * Track the given monster race
- */
-void monster_race_track(player_type *player_ptr, MONRACE_IDX r_idx)
-{
-    player_ptr->monster_race_idx = r_idx;
-    player_ptr->window |= (PW_MONSTER);
-}
-
-/*
- * Track the given object kind
- */
-void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx)
-{
-    player_ptr->object_kind_idx = k_idx;
-    player_ptr->window |= (PW_OBJECT);
-}
-
-/*
  * Determines if a map location is currently "on screen" -RAK-
  * Note that "panel_contains(Y,X)" always implies "in_bounds2(Y,X)".
  */
 bool panel_contains(POSITION y, POSITION x) { return (y >= panel_row_min) && (y <= panel_row_max) && (x >= panel_col_min) && (x <= panel_col_max); }
-
-/*
- * Delayed visual update
- * Only used if update_view(), update_lite() or update_mon_lite() was called
- */
-void delayed_visual_update(player_type *player_ptr)
-{
-    floor_type *floor_ptr = player_ptr->current_floor_ptr;
-    for (int i = 0; i < floor_ptr->redraw_n; i++) {
-        POSITION y = floor_ptr->redraw_y[i];
-        POSITION x = floor_ptr->redraw_x[i];
-        grid_type *g_ptr;
-        g_ptr = &floor_ptr->grid_array[y][x];
-        if (!(g_ptr->info & CAVE_REDRAW))
-            continue;
-
-        if (g_ptr->info & CAVE_NOTE)
-            note_spot(player_ptr, y, x);
-
-        lite_spot(player_ptr, y, x);
-        if (g_ptr->m_idx)
-            update_monster(player_ptr, g_ptr->m_idx, FALSE);
-
-        g_ptr->info &= ~(CAVE_NOTE | CAVE_REDRAW);
-    }
-
-    floor_ptr->redraw_n = 0;
-}

diff --git a/src/view/display-main-window.h b/src/view/display-main-window.h
index 8e38280..093b50d 100644 (file)
--- a/src/view/display-main-window.h
+++ b/src/view/display-main-window.h
@@ -4,13 +4,9 @@
 
 void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p);
 void apply_default_feat_lighting(TERM_COLOR *f_attr, SYMBOL_CODE *f_char);
-void health_track(player_type *player_ptr, MONSTER_IDX m_idx);
 void print_time(player_type *player_ptr);
 void move_cursor_relative(int row, int col);
 void print_path(player_type *player_ptr, POSITION y, POSITION x);
-void monster_race_track(player_type *player_ptr, MONRACE_IDX r_idx);
-void object_kind_track(player_type *player_ptr, KIND_OBJECT_IDX k_idx);
 void resize_map(void);
 bool change_panel(player_type *player_ptr, POSITION dy, POSITION dx);
 bool panel_contains(POSITION y, POSITION x);
-void delayed_visual_update(player_type *player_ptr);