[Refactor] #39970 Separated stuf--handler.c/h from core.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 53b1e67..d3bce6c 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -176,6 +176,7 @@
     <ClCompile Include="..\..\src\cmd\cmd-knowledge.c" />\r
     <ClCompile Include="..\..\src\cmd\cmd-process-screen.c" />\r
     <ClCompile Include="..\..\src\cmd\dump-util.c" />\r
+    <ClCompile Include="..\..\src\core\stuff-handler.c" />\r
     <ClCompile Include="..\..\src\effect\effect-feature.c" />\r
     <ClCompile Include="..\..\src\effect\effect-item.c" />\r
     <ClCompile Include="..\..\src\effect\effect-monster-charm.c" />\r
@@ -362,6 +363,7 @@
     <ClInclude Include="..\..\src\cmd\cmd-knowledge.h" />\r
     <ClInclude Include="..\..\src\cmd\cmd-process-screen.h" />\r
     <ClInclude Include="..\..\src\cmd\dump-util.h" />\r
+    <ClInclude Include="..\..\src\core\stuff-handler.h" />\r
     <ClInclude Include="..\..\src\effect\effect-characteristics.h" />\r
     <ClInclude Include="..\..\src\effect\effect-feature.h" />\r
     <ClInclude Include="..\..\src\effect\effect-item.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 8381d9c..05297ff 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -760,6 +760,9 @@
     <ClCompile Include="..\..\src\spell\process-effect.c">
       <Filter>spell</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\core\stuff-handler.c">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1535,6 +1538,9 @@
     <ClInclude Include="..\..\src\effect\effect-characteristics.h">
       <Filter>effect</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\core\stuff-handler.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 10e05bb..4969af6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -80,6 +80,7 @@ hengband_SOURCES = \
        io/uid-checker.c io/uid-checker.h \
        character-dump.c character-dump.h core.c core.h files.c files.h \
        core/show-file.c core/show-file.h \
+       core/stuff-handler.c core/stuff-handler.h \
        \
        dungeon.c dungeon.h \
        floor.c floor.h floor-events.c floor-events.h \

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 48a2884..d9c25bc 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -14,6 +14,7 @@
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "gameterm.h"
 
 #include "io/write-diary.h"

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index 952012f..c2ea067 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h" // 暫定。後で消す.
+#include "core/stuff-handler.h"
 #include "cmd/cmd-draw.h"
 #include "files.h"
 #include "gameterm.h"

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index 130850f..5a6f0f7 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -11,7 +11,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index c56a95c..baee162 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -11,7 +11,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 5ca49ad..4052927 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -11,7 +11,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index 9f961fa..9fb51e4 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 
 #include "io/write-diary.h"

diff --git a/src/cmd/cmd-save.c b/src/cmd/cmd-save.c
index 71fa70b..745671f 100644 (file)
--- a/src/cmd/cmd-save.c
+++ b/src/cmd/cmd-save.c
@@ -3,7 +3,7 @@
 #include "cmd/cmd-save.h"
 #include "cmd/cmd-dump.h"
 #include "player-move.h"
-#include "core.h" // 暫定。後で消す.
+#include "core/stuff-handler.h"
 #include "save.h"
 #include "world.h"
 #include "monster-status.h" // 違和感。要調査.

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index 78ab309..9e3f150 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -7,7 +7,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "cmd/cmd-spell.h"

diff --git a/src/combat/melee.c b/src/combat/melee.c
index 93cb283..fa60d5d 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index f4bf005..9d82110 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"

diff --git a/src/core.c b/src/core.c
index c38ed07..8de922c 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -16,6 +16,7 @@
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "inet.h"
 #include "gameterm.h"
 #include "chuukei.h"
@@ -4737,19 +4738,6 @@ void close_game(player_type *player_ptr)
 }
 
 
-/*!
- * @brief 全更新処理をチェックして処理していく
- * Handle "player_ptr->update" and "player_ptr->redraw" and "player_ptr->window"
- * @return なし
- */
-void handle_stuff(player_type *player_ptr)
-{
-       if (player_ptr->update) update_creature(player_ptr);
-       if (player_ptr->redraw) redraw_stuff(player_ptr);
-       if (player_ptr->window) window_stuff(player_ptr);
-}
-
-
 void update_output(player_type *player_ptr)
 {
        if (player_ptr->redraw) redraw_stuff(player_ptr);

diff --git a/src/core.h b/src/core.h
index 70a8dc7..496eb83 100644 (file)
--- a/src/core.h
+++ b/src/core.h
@@ -76,5 +76,4 @@ extern s32b turn_real(player_type *player_ptr, s32b hoge);
 extern void prevent_turn_overflow(player_type *player_ptr);
 extern void close_game(player_type *player_ptr);
 
-extern void handle_stuff(player_type *player_ptr);
 extern void update_output(player_type *player_ptr);

diff --git a/src/core/stuff-handler.c b/src/core/stuff-handler.c
new file mode 100644 (file)
index 0000000..cae7ee7
--- /dev/null
+++ b/src/core/stuff-handler.c
@@ -0,0 +1,18 @@
+#include "angband.h"
+#include "core/stuff-handler.h"
+#include "view/display-main-window.h"
+
+/*!
+ * @brief 全更新処理をチェックして処理していく
+ * Handle "player_ptr->update" and "player_ptr->redraw" and "player_ptr->window"
+ * @return なし
+ */
+void handle_stuff(player_type* player_ptr)
+{
+    if (player_ptr->update)
+        update_creature(player_ptr);
+    if (player_ptr->redraw)
+        redraw_stuff(player_ptr);
+    if (player_ptr->window)
+        window_stuff(player_ptr);
+}

diff --git a/src/core/stuff-handler.h b/src/core/stuff-handler.h
new file mode 100644 (file)
index 0000000..00c4c5c
--- /dev/null
+++ b/src/core/stuff-handler.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void handle_stuff(player_type* player_ptr);

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 01f242a..bbbf41d 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -10,7 +10,7 @@
 #include "io/write-diary.h"
 #include "main/sound-definitions-table.h"
 #include "player-move.h"
-#include "core.h" // 暫定、後で消す.
+#include "core/stuff-handler.h"
 #include "effect/effect-monster-util.h"
 #include "effect/effect-monster-switcher.h"
 #include "monster-status.h"

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index d86a01d..15a593b 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -16,7 +16,7 @@
 #include "cmd/object-group-table.h"
 #include "world.h"
 #include "gameterm.h"
-#include "core.h" // 暫定、後で消す.
+#include "core/stuff-handler.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
 
 /*

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index c8396ad..a369760 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -16,7 +16,7 @@
 #include "gameterm.h"
 #include "english.h"
 
-#include "core.h" // 暫定、後で消す.
+#include "core/stuff-handler.h"
 #include "view/display-main-window.h" // 暫定、後で消す.
 
  /*

diff --git a/src/main-win.c b/src/main-win.c
index 0cbaa0d..85cfde2 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -110,6 +110,7 @@
 #include "quest.h"
 #include "files.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "world.h"
 #include "gameterm.h"
 

diff --git a/src/market/building.c b/src/market/building.c
index 55ffb1d..4f3b0f9 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -18,6 +18,7 @@
 #include "gameterm.h"
 
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "core/show-file.h"
 #include "cmd/cmd-dump.h"
 #include "cmd/cmd-inn.h"

diff --git a/src/market/store.c b/src/market/store.c
index 733af48..d586d01 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -17,7 +17,7 @@
 #include "market/gold-magnification-table.h"
 #include "market/store-util.h"
 #include "market/black-market.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/mind.c b/src/mind.c
index cd5ce16..8189a6d 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -15,7 +15,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/monster-status.c b/src/monster-status.c
index 9114109..b4d8f3d 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/mspells3.c b/src/mspells3.c
index 4eedab3..c0fe5c0 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -11,7 +11,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/mutation.c b/src/mutation.c
index 25d07b6..7f698d5 100644 (file)
--- a/src/mutation.c
+++ b/src/mutation.c
@@ -12,7 +12,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "core/show-file.h"
 #include "util.h"
 

diff --git a/src/player-damage.c b/src/player-damage.c
index 71cdc56..18e1192 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/music-definitions-table.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index d7e6cfc..a5933e2 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -14,7 +14,7 @@
 
 #include "angband.h"
 #include "gameterm.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 
 #include "creature.h"

diff --git a/src/player-inventory.c b/src/player-inventory.c
index cda220b..e0bb8f2 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "player-inventory.h"
 

diff --git a/src/player-move.c b/src/player-move.c
index fe3fa7b..3ee5be0 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -141,6 +141,7 @@
 
 #include "angband.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/player-status.c b/src/player-status.c
index d6dbbcc..40d7e1b 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/racial.c b/src/racial.c
index 32002f6..6e8043d 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -11,7 +11,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 
 #include "cmd-basic.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 0e64017..99e3517 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 
 #include "cmd-spell.h"

diff --git a/src/report.c b/src/report.c
index 76f0c5a..67942fd 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -7,6 +7,7 @@
 
 #include "angband.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "inet.h"
 #include "dungeon.h"
 

diff --git a/src/snipe.c b/src/snipe.c
index 8e9e797..972d459 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -7,7 +7,7 @@
  */
 
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 #include "gameterm.h"

diff --git a/src/spell/process-effect.c b/src/spell/process-effect.c
index 83166ec..63f7055 100644 (file)
--- a/src/spell/process-effect.c
+++ b/src/spell/process-effect.c
@@ -2,7 +2,7 @@
 #include "effect/spells-effect-util.h"
 #include "spell/process-effect.h"
 #include "cmd-pet.h" // 暫定、後で消すかも.
-#include "core.h" // 暫定、後で消す.
+#include "core/stuff-handler.h"
 #include "effect/effect-feature.h"
 #include "effect/effect-item.h"
 #include "effect/effect-monster.h"

diff --git a/src/spells-status.c b/src/spells-status.c
index 6b671f1..524c7f4 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -1,5 +1,5 @@
 #include "angband.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 
 #include "cmd-magiceat.h"

diff --git a/src/spells2.c b/src/spells2.c
index 06f1e36..e7bacd3 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"
 

diff --git a/src/spells3.c b/src/spells3.c
index 6f04fa9..80e1efa 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -13,7 +13,7 @@
 
 #include "angband.h"
 #include "market/building.h"
-#include "core.h"
+#include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "util.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/targeting.c b/src/targeting.c
index 8f00ab4..ce44e15 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "targeting.h"
 

diff --git a/src/util.c b/src/util.c
index 5e18c02..f7753a2 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,6 +14,7 @@
 #include "main/music-definitions-table.h"
 #include "io/signal-handlers.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "gameterm.h"
 #include "util.h"
 #include "files.h"

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index d88bc3c..24ae009 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -19,6 +19,7 @@
 
 #include "market/building.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "files.h"
 #include "world.h"
 #include "quest.h"

diff --git a/src/wizard2.c b/src/wizard2.c
index 8e75c53..745d5fc 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "core.h"
+#include "core/stuff-handler.h"
 #include "gameterm.h"
 
 #include "dungeon.h"