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

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 871cf5e..20500a7 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -150,6 +150,7 @@
   <ItemGroup>\r
     <ClCompile Include="..\..\src\artifact.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-entry.c" />\r
+    <ClCompile Include="..\..\src\autopick\autopick-initializer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-menu-data-table.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-util.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick.c" />\r
@@ -295,6 +296,7 @@
     <ClInclude Include="..\..\src\autopick\autopick-editor-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-entry.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-flags-table.h" />\r
+    <ClInclude Include="..\..\src\autopick\autopick-initializer.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-menu-data-table.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index ea48128..dc93574 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -643,6 +643,9 @@
     <ClCompile Include="..\..\src\io\dump-remover.c">
       <Filter>io</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\autopick\autopick-initializer.c">
+      <Filter>autopick</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1289,6 +1292,9 @@
     <ClInclude Include="..\..\src\io\dump-remover.h">
       <Filter>io</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick\autopick-initializer.h">
+      <Filter>autopick</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index c33909f..213360f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ hengband_SOURCES = \
        autopick/autopick-methods-table.h \
        autopick/autopick-util.c autopick/autopick-util.h \
        autopick/autopick-entry.c autopick/autopick-entry.h \
+       autopick/autopick-initializer.c autopick/autopick-initializer.h \
        \
        avatar.h avatar.c birth.c birth.h \
        \

diff --git a/src/autopick/autopick-initializer.c b/src/autopick/autopick-initializer.c
new file mode 100644 (file)
index 0000000..afc77e0
--- /dev/null
+++ b/src/autopick/autopick-initializer.c
@@ -0,0 +1,28 @@
+#include "angband.h"
+#include "autopick/autopick-util.h"
+#include "autopick/autopick-entry.h"
+#include "autopick/autopick-initializer.h"
+
+/*
+ * Initialize the autopick
+ */
+void init_autopick(void)
+{
+       static const char easy_autopick_inscription[] = "(:=g";
+       autopick_type entry;
+       int i;
+
+       if (!autopick_list)
+       {
+               max_max_autopick = MAX_AUTOPICK_DEFAULT;
+               C_MAKE(autopick_list, max_max_autopick, autopick_type);
+               max_autopick = 0;
+       }
+
+       for (i = 0; i < max_autopick; i++)
+               autopick_free_entry(&autopick_list[i]);
+
+       max_autopick = 0;
+       autopick_new_entry(&entry, easy_autopick_inscription, TRUE);
+       autopick_list[max_autopick++] = entry;
+}

diff --git a/src/autopick/autopick-initializer.h b/src/autopick/autopick-initializer.h
new file mode 100644 (file)
index 0000000..572f799
--- /dev/null
+++ b/src/autopick/autopick-initializer.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void init_autopick(void);

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index cece558..c89b981 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -17,6 +17,7 @@
 #include "autopick/autopick-dirty-flags.h"
 #include "autopick/autopick-editor-table.h"
 #include "autopick/autopick-flags-table.h"
+#include "autopick/autopick-initializer.h"
 #include "autopick/autopick-key-flag-process.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "autopick/autopick-methods-table.h"
@@ -59,31 +60,6 @@
 static object_type autopick_last_destroyed_object;
 
 /*
- * Initialize the autopick
- */
-static void init_autopick(void)
-{
-       static const char easy_autopick_inscription[] = "(:=g";
-       autopick_type entry;
-       int i;
-
-       if (!autopick_list)
-       {
-               max_max_autopick = MAX_AUTOPICK_DEFAULT;
-               C_MAKE(autopick_list, max_max_autopick, autopick_type);
-               max_autopick = 0;
-       }
-
-       for (i = 0; i < max_autopick; i++)
-               autopick_free_entry(&autopick_list[i]);
-
-       max_autopick = 0;
-       autopick_new_entry(&entry, easy_autopick_inscription, TRUE);
-       autopick_list[max_autopick++] = entry;
-}
-
-
-/*
  *  Get file name for autopick preference
  */
 static concptr pickpref_filename(player_type *player_ptr, int filename_mode)