[Refactor] #40236 Separated lighting-level-table.c/h from cmd-dump.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 789625c..04daa0b 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -180,6 +180,7 @@
     <ClCompile Include="..\..\src\cmd\cmd-zapwand.c" />\r
     <ClCompile Include="..\..\src\cmd\diary-subtitle-table.c" />\r
     <ClCompile Include="..\..\src\cmd\feeling-table.c" />\r
+    <ClCompile Include="..\..\src\cmd\lighting-level-table.c" />\r
     <ClCompile Include="..\..\src\cmd\monster-group-table.c" />\r
     <ClCompile Include="..\..\src\cmd\object-group-table.c" />\r
     <ClCompile Include="..\..\src\combat\melee1.c" />\r
@@ -361,6 +362,7 @@
     <ClInclude Include="..\..\src\cmd\cmd-zapwand.h" />\r
     <ClInclude Include="..\..\src\cmd\diary-subtitle-table.h" />\r
     <ClInclude Include="..\..\src\cmd\feeling-table.h" />\r
+    <ClInclude Include="..\..\src\cmd\lighting-level-table.h" />\r
     <ClInclude Include="..\..\src\cmd\monster-group-table.h" />\r
     <ClInclude Include="..\..\src\cmd\object-group-table.h" />\r
     <ClInclude Include="..\..\src\combat\melee.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 805c809..ccdf09c 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -532,6 +532,9 @@
     <ClCompile Include="..\..\src\cmd\cmd-draw.c">
       <Filter>cmd</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\cmd\lighting-level-table.c">
+      <Filter>cmd</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1046,6 +1049,9 @@
     <ClInclude Include="..\..\src\cmd\cmd-draw.h">
       <Filter>cmd</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\cmd\lighting-level-table.h">
+      <Filter>cmd</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index d0f6aa5..0914a94 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -141,6 +141,7 @@ hengband_SOURCES = \
        cmd/cmd-draw.c cmd/cmd-draw.h cmd/cmd-eat.c cmd/cmd-eat.h \
        cmd/cmd-gameoption.c cmd/cmd-gameoption.h cmd/cmd-help.c cmd/cmd-help.h \
        cmd/cmd-hissatsu.c cmd/cmd-hissatsu.h cmd/cmd-item.c cmd/cmd-item.h \
+       cmd/lighting-level-table.c cmd/lighting-level-table.h \
        cmd/cmd-magiceat.c cmd/cmd-magiceat.h cmd/cmd-mane.c cmd/cmd-mane.h \
        cmd/cmd-macro.c cmd/cmd-macro.h cmd/cmd-pet.c cmd/cmd-pet.h \
        cmd/cmd-quaff.c cmd/cmd-quaff.h cmd/cmd-read.c cmd/cmd-read.h \

diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index d48c08d..cf51760 100644 (file)
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -33,6 +33,7 @@
 #include "angband.h"
 #include "cmd/cmd-draw.h"
 #include "cmd/cmd-dump.h"
+#include "cmd/lighting-level-table.h"
 #include "term.h"
 #include "core.h" // 暫定。後で消す.
 #include "core/show-file.h"
@@ -113,17 +114,6 @@ void do_cmd_reload_autopick(player_type *creature_ptr)
 
 
 /*!
- * @brief キャラクタ色の明暗表現
- */
-static concptr lighting_level_str[F_LIT_MAX] =
-{
-       _("標準色", "standard"),
-       _("明色", "brightly lit"),
-       _("暗色", "darkened"),
-};
-
-
-/*!
  * @brief キャラクタのビジュアルIDを変更する際の対象指定関数
  * @param i 指定対象となるキャラクタコード
  * @param num 指定されたビジュアルIDを返す参照ポインタ

diff --git a/src/cmd/lighting-level-table.c b/src/cmd/lighting-level-table.c
new file mode 100644 (file)
index 0000000..9134915
--- /dev/null
+++ b/src/cmd/lighting-level-table.c
@@ -0,0 +1,13 @@
+#include "angband.h"
+#include "cmd/lighting-level-table.h"
+#include "feature.h"
+
+/*!
+ * @brief キャラクタ色の明暗表現
+ */
+concptr lighting_level_str[F_LIT_MAX] =
+{
+       _("標準色", "standard"),
+       _("明色", "brightly lit"),
+       _("暗色", "darkened"),
+};

diff --git a/src/cmd/lighting-level-table.h b/src/cmd/lighting-level-table.h
new file mode 100644 (file)
index 0000000..46c164a
--- /dev/null
+++ b/src/cmd/lighting-level-table.h
@@ -0,0 +1,3 @@
+#pragma once
+
+concptr lighting_level_str[F_LIT_MAX];