[Refactor] #37353 handle_stuff() と update_output() を core.c/h へ移動．

diff --git a/src/cmd-hissatsu.c b/src/cmd-hissatsu.c
index b9a9cd3..ba14d6f 100644 (file)
--- a/src/cmd-hissatsu.c
+++ b/src/cmd-hissatsu.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "monsterrace-hook.h"

diff --git a/src/cmd-item.c b/src/cmd-item.c
index 74c08ea..742cf5e 100644 (file)
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -12,6 +12,7 @@
 
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 #include "autopick.h"
 #include "term.h"

diff --git a/src/cmd-mane.c b/src/cmd-mane.c
index 752b8ba..02dd29f 100644 (file)
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "floor.h"

diff --git a/src/cmd-pet.c b/src/cmd-pet.c
index cfb2097..2684acf 100644 (file)
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "cmd-dump.h"

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index f33a46d..7f05ae2 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -7,6 +7,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "cmd-dump.h"

diff --git a/src/core.c b/src/core.c
index 212f568..a6d6658 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -5895,3 +5895,23 @@ void close_game(void)
        /* Allow suspending now */
        signals_handle_tstp();
 }
+
+
+/*!
+ * @brief 全更新処理をチェックして処理していく
+ * Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window"
+ * @return なし
+ */
+void handle_stuff(void)
+{
+       if (p_ptr->update) update_creature(p_ptr);
+       if (p_ptr->redraw) redraw_stuff();
+       if (p_ptr->window) window_stuff();
+}
+
+void update_output(void)
+{
+       if (p_ptr->redraw) redraw_stuff();
+       if (p_ptr->window) window_stuff();
+}
+

diff --git a/src/core.h b/src/core.h
index b867235..d6b9582 100644 (file)
--- a/src/core.h
+++ b/src/core.h
@@ -26,3 +26,6 @@ extern void update_playtime(void);
 extern s32b turn_real(s32b hoge);
 extern void prevent_turn_overflow(void);
 extern void close_game(void);
+
+extern void handle_stuff(void);
+extern void update_output(void);

diff --git a/src/externs.h b/src/externs.h
index 827eb99..c3009a8 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -79,10 +79,6 @@ extern bool new_mane;
 extern DEPTH *max_dlv;
 extern bool use_menu;
 
-/* xtra1.c */
-extern void handle_stuff(void);
-extern void update_output(void);
-
 #ifdef MACINTOSH
 /* main-mac.c */
 /* extern void main(void); */

diff --git a/src/melee1.c b/src/melee1.c
index 72d62d6..ba8a10b 100644 (file)
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "artifact.h"

diff --git a/src/mind.c b/src/mind.c
index 27fab7e..c539db4 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -15,6 +15,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "mind.h"

diff --git a/src/monster-status.c b/src/monster-status.c
index 6a62483..d973eb3 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "creature.h"

diff --git a/src/mspells3.c b/src/mspells3.c
index e2f18c8..7c3a2c2 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "floor.h"

diff --git a/src/mutation.c b/src/mutation.c
index 61d2651..a2cbb47 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "cmd-dump.h"

diff --git a/src/object1.c b/src/object1.c
index 20acc87..57d6e9f 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "artifact.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 7b689b9..9d9e936 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -13,6 +13,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "creature.h"

diff --git a/src/player-move.c b/src/player-move.c
index 7d6fb1e..fd555e1 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -140,6 +140,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "autopick.h"

diff --git a/src/player-status.c b/src/player-status.c
index 9215a97..edd358d 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "quest.h"

diff --git a/src/racial.c b/src/racial.c
index 525adb0..e7e384c 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "cmd-basic.h"

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 14f6cb5..739613e 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/shoot.c b/src/shoot.c
index 78b8011..cf3fd5b 100644 (file)
--- a/src/shoot.c
+++ b/src/shoot.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "monster.h"

diff --git a/src/snipe.c b/src/snipe.c
index 65bf445..643674f 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -7,6 +7,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "player-status.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index 65d1130..ed33fa4 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -1,4 +1,5 @@
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "avatar.h"

diff --git a/src/spells1.c b/src/spells1.c
index 37dcf05..1742fb0 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "cmd-pet.h"

diff --git a/src/spells2.c b/src/spells2.c
index 161c2f1..36c07c4 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -12,6 +12,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 
 #include "creature.h"

diff --git a/src/spells3.c b/src/spells3.c
index 2389ab4..035c382 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "bldg.h"
+#include "core.h"
 #include "util.h"
 
 #include "creature.h"

diff --git a/src/store.c b/src/store.c
index 4b4b385..1c4977a 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -11,6 +11,7 @@
  */
 
 #include "angband.h"
+#include "core.h"
 #include "util.h"
 #include "term.h"
 

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index b66b8d6..6407a87 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -2063,7 +2063,7 @@ bool is_heavy_shoot(object_type *o_ptr)
  * @return なし
  * @details 更新処理の対象はゲーム中の全描画処理
  */
-static void redraw_stuff(void)
+void redraw_stuff(void)
 {
        if (!p_ptr->redraw) return;
 
@@ -2248,7 +2248,7 @@ static void redraw_stuff(void)
  * @return なし
  * @details 更新処理の対象はサブウィンドウ全般
  */
-static void window_stuff(void)
+void window_stuff(void)
 {
        int j;
        BIT_FLAGS mask = 0L;
@@ -2340,25 +2340,6 @@ static void window_stuff(void)
        }
 }
 
-
-/*!
- * @brief 全更新処理をチェックして処理していく
- * Handle "p_ptr->update" and "p_ptr->redraw" and "p_ptr->window"
- * @return なし
- */
-void handle_stuff(void)
-{
-       if (p_ptr->update) update_creature(p_ptr);
-       if (p_ptr->redraw) redraw_stuff();
-       if (p_ptr->window) window_stuff();
-}
-
-void update_output(void)
-{
-       if (p_ptr->redraw) redraw_stuff();
-       if (p_ptr->window) window_stuff();
-}
-
 /*!
  * @brief コンソールのリサイズに合わせてマップを再描画する /
  * Map resizing whenever the main term changes size

diff --git a/src/view-mainwindow.h b/src/view-mainwindow.h
index de26232..5d6461d 100644 (file)
--- a/src/view-mainwindow.h
+++ b/src/view-mainwindow.h
@@ -20,3 +20,6 @@ extern void resize_map(void);
 extern void redraw_window(void);
 extern bool change_panel(POSITION dy, POSITION dx);
 
+extern void window_stuff(void);
+extern void redraw_stuff(void);
+

diff --git a/src/wizard2.c b/src/wizard2.c
index 2aa9e7b..59cce03 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -11,6 +11,8 @@
  */
 
 #include "angband.h"
+#include "core.h"
+
 #include "dungeon.h"
 #include "cmd-dump.h"
 #include "util.h"