[Refactor] #40483 Separated main-window-util.c/h from display-main-window.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index fdcd543..8396242 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -207,6 +207,7 @@
     <ClCompile Include="..\..\src\io\input-key-acceptor.c" />\r
     <ClCompile Include="..\..\src\io\input-key-requester.c" />\r
     <ClCompile Include="..\..\src\locale\vowel-checker.c" />\r
+    <ClCompile Include="..\..\src\view\main-window-util.c" />\r
     <ClCompile Include="..\..\src\mspell\monster-power-table.c" />\r
     <ClCompile Include="..\..\src\system\alloc-entries.c" />\r
     <ClCompile Include="..\..\src\term\screen-processor.c" />\r
@@ -1012,6 +1013,7 @@
     <ClInclude Include="..\..\src\view\display-messages.h" />\r
     <ClInclude Include="..\..\src\view\display-monster-status.h" />\r
     <ClInclude Include="..\..\src\view\main-window-row-column.h" />\r
+    <ClInclude Include="..\..\src\view\main-window-util.h" />\r
     <ClInclude Include="..\..\src\view\object-describer.h" />\r
     <ClInclude Include="..\..\src\view\status-bars-table.h" />\r
     <ClInclude Include="..\..\src\world\world-object.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 9dbe70a..a56f85c 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -1406,6 +1406,9 @@
     <ClCompile Include="..\..\src\view\status-bars-table.c">
       <Filter>view</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\view\main-window-util.c">
+      <Filter>view</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\cmd\cmd-basic.h">
@@ -3100,6 +3103,9 @@
     <ClInclude Include="..\..\src\view\main-window-row-column.h">
       <Filter>view</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\view\main-window-util.h">
+      <Filter>view</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 4939e10..b444711 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -588,6 +588,7 @@ hengband_SOURCES = \
        view/display-player.c view/display-player.h \
        view/display-util.c view/display-util.h \
        view/main-window-row-column.h \
+       view/main-window-util.c view/main-window-util.h \
        view/object-describer.c view/object-describer.h \
        view/status-first-page.c view/status-first-page.h \
        view/status-bars-table.c view/status-bars-table.h \

diff --git a/src/player/player-class.c b/src/player/player-class.c
index b10c8a0..ed447d3 100644 (file)
--- a/src/player/player-class.c
+++ b/src/player/player-class.c
@@ -5,6 +5,7 @@
  */
 
 #include "player/player-class.h"
+#include "player/player-race.h"
 #include "system/object-type-definition.h"
 
 /*

diff --git a/src/view/display-main-window.c b/src/view/display-main-window.c
index ae61cbc..73fd12c 100644 (file)
--- a/src/view/display-main-window.c
+++ b/src/view/display-main-window.c
@@ -68,6 +68,7 @@
 #include "view/display-messages.h"
 #include "view/display-player.h"
 #include "view/main-window-row-column.h"
+#include "view/main-window-util.h"
 #include "view/object-describer.h"
 #include "view/status-bars-table.h"
 #include "world/world.h"
@@ -94,20 +95,6 @@ void display_map(player_type *player_ptr, int *cy, int *cx);
 void set_term_color(player_type *player_ptr, POSITION y, POSITION x, TERM_COLOR *ap, SYMBOL_CODE *cp);
 
 /*!
- * @brief 画面左の能力値表示を行うために指定位置から13キャラ分を空白消去後指定のメッセージを明るい青で描画する /
- * Print character info at given row, column in a 13 char field
- * @param info 表示文字列
- * @param row 描画列
- * @param col 描画行
- * @return なし
- */
-static void print_field(concptr info, TERM_LEN row, TERM_LEN col)
-{
-    c_put_str(TERM_WHITE, "             ", row, col);
-    c_put_str(TERM_L_BLUE, info, row, col);
-}
-
-/*!
  * @brief ゲーム時刻を表示する /
  * Print time
  * @return なし

diff --git a/src/view/main-window-util.c b/src/view/main-window-util.c
new file mode 100644 (file)
index 0000000..52853b7
--- /dev/null
+++ b/src/view/main-window-util.c
@@ -0,0 +1,17 @@
+#include "view/main-window-util.h"
+#include "term/screen-processor.h"
+#include "term/term-color-types.h"
+
+/*!
+ * @brief 画面左の能力値表示を行うために指定位置から13キャラ分を空白消去後指定のメッセージを明るい青で描画する /
+ * Print character info at given row, column in a 13 char field
+ * @param info 表示文字列
+ * @param row 描画列
+ * @param col 描画行
+ * @return なし
+ */
+void print_field(concptr info, TERM_LEN row, TERM_LEN col)
+{
+    c_put_str(TERM_WHITE, "             ", row, col);
+    c_put_str(TERM_L_BLUE, info, row, col);
+}

diff --git a/src/view/main-window-util.h b/src/view/main-window-util.h
new file mode 100644 (file)
index 0000000..f4cf472
--- /dev/null
+++ b/src/view/main-window-util.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "system/angband.h"
+
+void print_field(concptr info, TERM_LEN row, TERM_LEN col);