[Refactor] Separated autopick-adder.c/h from autopick-reader-writer.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 7b1c364..575f9da 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -149,6 +149,7 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\src\artifact.c" />\r
+    <ClCompile Include="..\..\src\autopick\autopick-adder.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-describer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-destroyer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-entry.c" />\r
@@ -296,6 +297,7 @@
     <ClCompile Include="..\..\src\realm-song.c" />\r
     <ClCompile Include="..\..\src\realm-sorcery.c" />\r
     <ClInclude Include="..\..\src\artifact.h" />\r
+    <ClInclude Include="..\..\src\autopick\autopick-adder.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-commands-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-describer.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-destroyer.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index c0e555e..fd6b2d4 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -664,6 +664,9 @@
     <ClCompile Include="..\..\src\autopick\autopick-finder.c">
       <Filter>autopick</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\autopick\autopick-adder.c">
+      <Filter>autopick</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1331,6 +1334,9 @@
     <ClInclude Include="..\..\src\autopick\autopick-finder.h">
       <Filter>autopick</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick\autopick-adder.h">
+      <Filter>autopick</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 965af16..34158d5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@ hengband_SOURCES = \
        autopick-destroyer.c autopick-destroyer.h \
        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 \
        \
        avatar.h avatar.c birth.c birth.h \
        \

diff --git a/src/autopick/autopick-adder.c b/src/autopick/autopick-adder.c
new file mode 100644 (file)
index 0000000..cc33ceb
--- /dev/null
+++ b/src/autopick/autopick-adder.c
@@ -0,0 +1,22 @@
+#include "angband.h"
+#include "autopick/autopick-util.h"
+#include "autopick/autopick-adder.h"
+
+/*
+ * Add one line to autopick_list[]
+ */
+void add_autopick_list(autopick_type *entry)
+{
+       if (max_autopick >= max_max_autopick)
+       {
+               int old_max_max_autopick = max_max_autopick;
+               autopick_type *old_autopick_list = autopick_list;
+               max_max_autopick += MAX_AUTOPICK_DEFAULT;
+               C_MAKE(autopick_list, max_max_autopick, autopick_type);
+               (void)C_COPY(autopick_list, old_autopick_list, old_max_max_autopick, autopick_type);
+               C_KILL(old_autopick_list, old_max_max_autopick, autopick_type);
+       }
+
+       autopick_list[max_autopick] = *entry;
+       max_autopick++;
+}

diff --git a/src/autopick/autopick-adder.h b/src/autopick/autopick-adder.h
new file mode 100644 (file)
index 0000000..7731a6e
--- /dev/null
+++ b/src/autopick/autopick-adder.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void add_autopick_list(autopick_type *entry);

diff --git a/src/autopick/autopick-reader-writer.c b/src/autopick/autopick-reader-writer.c
index 44a25a8..c18102d 100644 (file)
--- a/src/autopick/autopick-reader-writer.c
+++ b/src/autopick/autopick-reader-writer.c
@@ -87,26 +87,6 @@ static concptr *read_text_lines(concptr filename)
 
 
 /*
- * Add one line to autopick_list[]
- */
-void add_autopick_list(autopick_type *entry)
-{
-       if (max_autopick >= max_max_autopick)
-       {
-               int old_max_max_autopick = max_max_autopick;
-               autopick_type *old_autopick_list = autopick_list;
-               max_max_autopick += MAX_AUTOPICK_DEFAULT;
-               C_MAKE(autopick_list, max_max_autopick, autopick_type);
-               (void)C_COPY(autopick_list, old_autopick_list, old_max_max_autopick, autopick_type);
-               C_KILL(old_autopick_list, old_max_max_autopick, autopick_type);
-       }
-
-       autopick_list[max_autopick] = *entry;
-       max_autopick++;
-}
-
-
-/*
  * Copy the default autopick file to the user directory
  */
 static void prepare_default_pickpref(player_type *player_ptr)

diff --git a/src/autopick/autopick-reader-writer.h b/src/autopick/autopick-reader-writer.h
index b7f63e9..18ef4cf 100644 (file)
--- a/src/autopick/autopick-reader-writer.h
+++ b/src/autopick/autopick-reader-writer.h
@@ -6,4 +6,3 @@ void autopick_load_pref(player_type *player_ptr, bool disp_mes);
 concptr *read_pickpref_text_lines(player_type *player_ptr, int *filename_mode_p);
 bool write_text_lines(concptr filename, concptr *lines_list);
 concptr pickpref_filename(player_type *player_ptr, int filename_mode);
-void add_autopick_list(autopick_type *entry);

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 5cd8d0e..aa5d09d 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -27,6 +27,7 @@
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-finder.h"
+#include "autopick/autopick-adder.h"
 #include "gameterm.h"
 #include "autopick/autopick.h"
 #include "core.h"

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