[Refactor] #39964 Separated autopick-key-flag-process.h from autopick.c

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 7045a17..6ddf184 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -290,6 +290,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-dirty-flags.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-editor-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-flags-table.h" />\r
+    <ClInclude Include="..\..\src\autopick\autopick-key-flag-process.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-keys-table.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 7e87b69..3cd3fc7 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -1259,6 +1259,9 @@
     <ClInclude Include="..\..\src\autopick\autopick-dirty-flags.h">
       <Filter>autopick</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick\autopick-key-flag-process.h">
+      <Filter>autopick</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index abc119a..1bc8fbd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ hengband_SOURCES = \
        autopick/autopick.c autopick/autopick.h \
        autopick/autopick-commands-table.h autopick/autopick-dirty-flags.h \
        autopick/autopick-editor-table.h autopick/autopick-flags-table.h \
-       autopick/autopick-key-table.h \
+       autopick/autopick-key-flag-process.h autopick/autopick-key-table.h \
        \
        avatar.h avatar.c birth.c birth.h \
        \

diff --git a/src/autopick/autopick-key-flag-process.h b/src/autopick/autopick-key-flag-process.h
new file mode 100644 (file)
index 0000000..94a417d
--- /dev/null
+++ b/src/autopick/autopick-key-flag-process.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#define MATCH_KEY(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\
+     ? (ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE)
+#define MATCH_KEY2(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\
+     ? (prev_ptr = ptr, ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE)
+
+#ifdef JP
+#define ADD_KEY(KEY) strcat(ptr, KEY)
+#else
+#define ADD_KEY(KEY) (strcat(ptr, KEY), strcat(ptr, " "))
+#endif
+#define ADD_KEY2(KEY) strcat(ptr, KEY)
+
+#define ADD_FLG(FLG) (entry->flag[FLG / 32] |= (1L << (FLG % 32)))
+#define REM_FLG(FLG) (entry->flag[FLG / 32] &= ~(1L << (FLG % 32)))
+#define ADD_FLG_NOUN(FLG) (ADD_FLG(FLG), prev_flg = FLG)
+#define IS_FLG(FLG) (entry->flag[FLG / 32] & (1L << (FLG % 32)))

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 7db5421..9cf1768 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -16,6 +16,7 @@
 #include "autopick/autopick-commands-table.h"
 #include "autopick/autopick-dirty-flags.h"
 #include "autopick/autopick-editor-table.h"
+#include "autopick/autopick-key-flag-process.h"
 #include "autopick/autopick-flags-table.h"
 #include "autopick/autopick-keys-table.h"
 #include "gameterm.h"
@@ -68,23 +69,6 @@
 
 #define DESCRIPT_HGT 3
 
-#define MATCH_KEY(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\
-     ? (ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE)
-#define MATCH_KEY2(KEY) (!strncmp(ptr, KEY, sizeof(KEY)-1)\
-     ? (prev_ptr = ptr, ptr += sizeof(KEY)-1, (' '==*ptr) ? ptr++ : 0, TRUE) : FALSE)
-
-#ifdef JP
-#define ADD_KEY(KEY) strcat(ptr, KEY)
-#else
-#define ADD_KEY(KEY) (strcat(ptr, KEY), strcat(ptr, " "))
-#endif
-#define ADD_KEY2(KEY) strcat(ptr, KEY)
-
-#define ADD_FLG(FLG) (entry->flag[FLG / 32] |= (1L << (FLG % 32)))
-#define REM_FLG(FLG) (entry->flag[FLG / 32] &= ~(1L << (FLG % 32)))
-#define ADD_FLG_NOUN(FLG) (ADD_FLG(FLG), prev_flg = FLG)
-#define IS_FLG(FLG) (entry->flag[FLG / 32] & (1L << (FLG % 32)))
-
 #ifdef JP
 static char kanji_colon[] = "：";
 #endif