[Refactor] #39964 Separated autopick-methods-table.h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index c105341..b1ba521 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -294,6 +294,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-key-flag-process.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-keys-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-menu-data-table.h" />\r
+    <ClInclude Include="..\..\src\autopick\autopick-methods-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-util.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick.h" />\r
     <ClInclude Include="..\..\src\avatar.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 1ce9b2a..ad4c73f 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -1271,6 +1271,9 @@
     <ClInclude Include="..\..\src\autopick\autopick-menu-data-table.h">
       <Filter>autopick</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick\autopick-methods-table.h">
+      <Filter>autopick</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index df23def..13a05d6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ hengband_SOURCES = \
        autopick/autopick-editor-table.h autopick/autopick-flags-table.h \
        autopick/autopick-key-flag-process.h autopick/autopick-key-table.h \
        autopick/autopick-menu-data-table.c autopick/autopick-menu-data-table.h \
-       autopick/autopick-util.c autopick/autopick-util.h \
+       autopick/autopick-methods-table.h autopick/autopick-util.h \
        \
        avatar.h avatar.c birth.c birth.h \
        \

diff --git a/src/autopick/autopick-methods-table.h b/src/autopick/autopick-methods-table.h
new file mode 100644 (file)
index 0000000..e612e52
--- /dev/null
+++ b/src/autopick/autopick-methods-table.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define DO_AUTOPICK       0x01
+#define DO_AUTODESTROY    0x02
+#define DO_DISPLAY        0x04
+#define DONT_AUTOPICK     0x08
+#define ITEM_DISPLAY      0x10
+#define DO_QUERY_AUTOPICK 0x20

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 0c3fddb..4528a89 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -19,6 +19,7 @@
 #include "autopick/autopick-flags-table.h"
 #include "autopick/autopick-key-flag-process.h"
 #include "autopick/autopick-menu-data-table.h"
+#include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-keys-table.h"
 #include "gameterm.h"
 #include "autopick/autopick.h"

diff --git a/src/autopick/autopick.h b/src/autopick/autopick.h
index d026ecb..c77814b 100644 (file)
--- a/src/autopick/autopick.h
+++ b/src/autopick/autopick.h
@@ -2,13 +2,6 @@
 
 #include "autopick/autopick-util.h"
 
-#define DO_AUTOPICK       0x01
-#define DO_AUTODESTROY    0x02
-#define DO_DISPLAY        0x04
-#define DONT_AUTOPICK     0x08
-#define ITEM_DISPLAY      0x10
-#define DO_QUERY_AUTOPICK 0x20
-
 /*
  *  List for auto-picker/destroyer entries
  */

diff --git a/src/knowledge/knowledge-autopick.c b/src/knowledge/knowledge-autopick.c
index 1ba05dc..e641216 100644 (file)
--- a/src/knowledge/knowledge-autopick.c
+++ b/src/knowledge/knowledge-autopick.c
@@ -5,10 +5,11 @@
  */
 
 #include "angband.h"
-#include "knowledge-autopick.h"
+#include "knowledge/knowledge-autopick.h"
 #include "cmd/dump-util.h"
 #include "core/show-file.h"
 #include "autopick/autopick.h"
+#include "autopick/autopick-methods-table.h"
 
  /*!
   * @brief 自動拾い設定ファイルをロードするコマンドのメインルーチン /

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index cbd3d12..262b7f5 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -13,6 +13,7 @@
 #include "angband.h"
 #include "util.h"
 #include "autopick/autopick.h"
+#include "autopick/autopick-methods-table.h"
 #include "gameterm.h"
 
 #include "market/building.h"