[Refactor] #39964 Separated autopick-pref-processor.c/h from autopick.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 575f9da..8523d35 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -157,6 +157,7 @@
     <ClCompile Include="..\..\src\autopick\autopick-initializer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-matcher.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-menu-data-table.c" />\r
+    <ClCompile Include="..\..\src\autopick\autopick-pref-processor.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-reader-writer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-util.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick.c" />\r
@@ -312,6 +313,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-matcher.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-pref-processor.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-reader-writer.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-util.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index fd6b2d4..7a11181 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -667,6 +667,9 @@
     <ClCompile Include="..\..\src\autopick\autopick-adder.c">
       <Filter>autopick</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\autopick\autopick-pref-processor.c">
+      <Filter>autopick</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1337,6 +1340,9 @@
     <ClInclude Include="..\..\src\autopick\autopick-adder.h">
       <Filter>autopick</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick\autopick-pref-processor.h">
+      <Filter>autopick</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 34158d5..d319c5c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ hengband_SOURCES = \
        autopick/autopick-reader-writer.c autopick/autopick-reader-writer.h \
        autopick/autopick-finder.c autopick/autopick-finder.h \
        autopick/autopick-adder.c autopick/autopick-adder.h \
+       autopick/autopick-pref-processor.c autopick/autopick-pref-processor.h \
        \
        avatar.h avatar.c birth.c birth.h \
        \

diff --git a/src/autopick/autopick-pref-processor.c b/src/autopick/autopick-pref-processor.c
new file mode 100644 (file)
index 0000000..9590a1e
--- /dev/null
+++ b/src/autopick/autopick-pref-processor.c
@@ -0,0 +1,46 @@
+#include "angband.h"
+#include "autopick/autopick-pref-processor.h"
+#include "autopick/autopick-util.h"
+#include "autopick/autopick-adder.h"
+#include "autopick/autopick-entry.h"
+
+/*
+ *  Process line for auto picker/destroyer.
+ */
+void process_autopick_file_command(char *buf)
+{
+       autopick_type an_entry, *entry = &an_entry;
+       int count = 0;
+       for (int i = 0; buf[i]; i++)
+       {
+#ifdef JP
+               if (iskanji(buf[i]))
+               {
+                       i++;
+                       continue;
+               }
+#endif
+               if (iswspace(buf[i]) && buf[i] != ' ')
+                       break;
+
+               count++;
+       }
+
+       buf[count] = 0;
+       if (!autopick_new_entry(entry, buf, FALSE)) return;
+
+       for (int i = 0; i < max_autopick; i++)
+       {
+               if (!strcmp(entry->name, autopick_list[i].name)
+                       && entry->flag[0] == autopick_list[i].flag[0]
+                       && entry->flag[1] == autopick_list[i].flag[1]
+                       && entry->dice == autopick_list[i].dice
+                       && entry->bonus == autopick_list[i].bonus)
+               {
+                       autopick_free_entry(entry);
+                       return;
+               }
+       }
+
+       add_autopick_list(entry);
+}

diff --git a/src/autopick/autopick-pref-processor.h b/src/autopick/autopick-pref-processor.h
new file mode 100644 (file)
index 0000000..14c4482
--- /dev/null
+++ b/src/autopick/autopick-pref-processor.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void process_autopick_file_command(char *buf);

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index aa5d09d..13553b5 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -28,6 +28,7 @@
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-finder.h"
 #include "autopick/autopick-adder.h"
+#include "autopick/autopick-pref-processor.h"
 #include "gameterm.h"
 #include "autopick/autopick.h"
 #include "core.h"
@@ -56,47 +57,7 @@
 #include "view/display-main-window.h" // 暫定。後で消す.
 
 /*
- *  Process line for auto picker/destroyer.
- */
-void process_autopick_file_command(char *buf)
-{
-       autopick_type an_entry, *entry = &an_entry;
-       int i;
-       for (i = 0; buf[i]; i++)
-       {
-#ifdef JP
-               if (iskanji(buf[i]))
-               {
-                       i++;
-                       continue;
-               }
-#endif
-               if (iswspace(buf[i]) && buf[i] != ' ')
-                       break;
-       }
-
-       buf[i] = 0;
-       if (!autopick_new_entry(entry, buf, FALSE)) return;
-
-       for (i = 0; i < max_autopick; i++)
-       {
-               if (!strcmp(entry->name, autopick_list[i].name)
-                       && entry->flag[0] == autopick_list[i].flag[0]
-                       && entry->flag[1] == autopick_list[i].flag[1]
-                       && entry->dice == autopick_list[i].dice
-                       && entry->bonus == autopick_list[i].bonus)
-               {
-                       autopick_free_entry(entry);
-                       return;
-               }
-       }
-
-       add_autopick_list(entry);
-}
-
-
-/*
- *  Auto inscription
+ * Auto inscription
  */
 static void auto_inscribe_item(player_type *player_ptr, object_type *o_ptr, int idx)
 {

diff --git a/src/autopick/autopick.h b/src/autopick/autopick.h
index 7571c61..d8193bc 100644 (file)
--- a/src/autopick/autopick.h
+++ b/src/autopick/autopick.h
@@ -2,7 +2,6 @@
 
 #include "autopick/autopick-util.h"
 
-extern void process_autopick_file_command(char *buf);
 extern void autopick_alter_item(player_type *player_ptr, INVENTORY_IDX item, bool destroy);
 extern void autopick_delayed_alter(player_type *player_ptr);
 extern void autopick_pickup_items(player_type *player_ptr, grid_type *g_ptr);

diff --git a/src/io/read-pref-file.c b/src/io/read-pref-file.c
index 9bda358..42d5cc3 100644 (file)
--- a/src/io/read-pref-file.c
+++ b/src/io/read-pref-file.c
@@ -18,7 +18,7 @@
 #include "io/dump-remover.h"
 #include "io/read-pref-file.h"
 #include "io/interpret-pref-file.h"
-#include "autopick/autopick.h"
+#include "autopick/autopick-pref-processor.h"
 #include "files.h" // 暫定。コールバック化して後で消す.
 #include "world.h"