[Refactor] #39970 Separated output-updater.c/h from core.c/h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index a8b78bb..e633be6 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -177,6 +177,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\output-updater.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
@@ -365,6 +366,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\output-updater.h" />\r
     <ClInclude Include="..\..\src\core\special-internal-keys.h" />\r
     <ClInclude Include="..\..\src\core\stuff-handler.h" />\r
     <ClInclude Include="..\..\src\core\angband-version.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index d99830c..6b84093 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -766,6 +766,9 @@
     <ClCompile Include="..\..\src\birth\birth.c">
       <Filter>birth</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\core\output-updater.c">
+      <Filter>core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1559,6 +1562,9 @@
     <ClInclude Include="..\..\src\birth\birth.h">
       <Filter>birth</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\core\output-updater.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index e45ae61..97e5cd1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,6 +85,7 @@ hengband_SOURCES = \
        core/show-file.c core/show-file.h \
        core/stuff-handler.c core/stuff-handler.h \
        core/angband-version.h core/special-internal-keys.h \
+       core/output-updater.c core/output-updater.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 3b630ac..e4b9658 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -53,6 +53,7 @@
 #include "world.h"
 #include "effect/spells-effect-util.h"
 #include "spell/spells3.h"
+#include "core/output-updater.h"
 
 /*!
  * @brief フロア脱出時に出戻りが不可能だった場合に警告を加える処理

diff --git a/src/core.c b/src/core.c
index ceca369..a6a64e3 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -120,6 +120,7 @@
 #include "spell/spells-execution.h"
 #include "spell/spells2.h"
 #include "spell/spells3.h"
+#include "core/output-updater.h"
 
  /*!
   * コピーライト情報 /
@@ -4740,10 +4741,3 @@ void close_game(player_type *player_ptr)
        clear_saved_floor_files(player_ptr);
        signals_handle_tstp();
 }
-
-
-void update_output(player_type *player_ptr)
-{
-       if (player_ptr->redraw) redraw_stuff(player_ptr);
-       if (player_ptr->window) window_stuff(player_ptr);
-}

diff --git a/src/core.h b/src/core.h
index 33d90de..3353014 100644 (file)
--- a/src/core.h
+++ b/src/core.h
@@ -24,5 +24,3 @@ extern void play_game(player_type *player_ptr, bool new_game);
 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 update_output(player_type *player_ptr);

diff --git a/src/core/output-updater.c b/src/core/output-updater.c
new file mode 100644 (file)
index 0000000..9d57694
--- /dev/null
+++ b/src/core/output-updater.c
@@ -0,0 +1,17 @@
+/*!
+ * @brief メインウィンドウの再描画を行う
+ * @date 2020/05/09
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "core/output-updater.h"
+#include "view/display-main-window.h"
+
+void update_output(player_type* player_ptr)
+{
+    if (player_ptr->redraw)
+        redraw_stuff(player_ptr);
+    if (player_ptr->window)
+        window_stuff(player_ptr);
+}

diff --git a/src/core/output-updater.h b/src/core/output-updater.h
new file mode 100644 (file)
index 0000000..ce26e49
--- /dev/null
+++ b/src/core/output-updater.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void update_output(player_type* player_ptr);

diff --git a/src/util.c b/src/util.c
index f7753a2..677babf 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -27,6 +27,7 @@
 #include "cmd/cmd-dump.h"
 #include "japanese.h"
 #include "player-class.h"
+#include "core/output-updater.h"
 
 /*!
  * 10進数から16進数への変換テーブル /