[Refactor] Unified autopick-adder.c/h into utopick-util.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index a2f819e..8f29fe9 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -149,7 +149,6 @@
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\src\artifact.c" />\r
-    <ClCompile Include="..\..\src\autopick\autopick-adder.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-command-menu.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-describer.c" />\r
     <ClCompile Include="..\..\src\autopick\autopick-destroyer.c" />\r
@@ -305,7 +304,6 @@
     <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-command-menu.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-commands-table.h" />\r
     <ClInclude Include="..\..\src\autopick\autopick-describer.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 848c426..f7f8875 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -625,9 +625,6 @@
     <ClCompile Include="..\..\src\autopick\autopick-entry.c">
       <Filter>autopick</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\autopick\autopick-util.c">
-      <Filter>autopick</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\io\dump-remover.c">
       <Filter>io</Filter>
     </ClCompile>
@@ -664,9 +661,6 @@
     <ClCompile Include="..\..\src\autopick\autopick-finder.c">
       <Filter>autopick</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\autopick\autopick-adder.c">
-      <Filter>autopick</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\autopick\autopick-pref-processor.c">
       <Filter>autopick</Filter>
     </ClCompile>
@@ -691,6 +685,9 @@
     <ClCompile Include="..\..\src\cmd\cmd-autopick.c">
       <Filter>cmd</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\autopick\autopick-util.c">
+      <Filter>autopick</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1358,9 +1355,6 @@
     <ClInclude Include="..\..\src\autopick\autopick-finder.h">
       <Filter>autopick</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\autopick\autopick-adder.h">
-      <Filter>autopick</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\autopick\autopick-pref-processor.h">
       <Filter>autopick</Filter>
     </ClInclude>

diff --git a/src/Makefile.am b/src/Makefile.am
index 696457b..7136423 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@ 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 \
        autopick/autopick-pref-processor.c autopick/autopick-pref-processor.h \
        autopick/autopick-drawer.c autopick/autopick-drawer.h \
        autopick/autopick-inserter-killer.c autopick/autopick-inserter-killer.h \

diff --git a/src/autopick/autopick-adder.c b/src/autopick/autopick-adder.c
deleted file mode 100644 (file)
index cc33ceb..0000000
--- a/src/autopick/autopick-adder.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#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
deleted file mode 100644 (file)
index 7731a6e..0000000
--- a/src/autopick/autopick-adder.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-void add_autopick_list(autopick_type *entry);

diff --git a/src/autopick/autopick-pref-processor.c b/src/autopick/autopick-pref-processor.c
index 9590a1e..a6fbd4e 100644 (file)
--- a/src/autopick/autopick-pref-processor.c
+++ b/src/autopick/autopick-pref-processor.c
@@ -1,7 +1,6 @@
 #include "angband.h"
 #include "autopick/autopick-pref-processor.h"
 #include "autopick/autopick-util.h"
-#include "autopick/autopick-adder.h"
 #include "autopick/autopick-entry.h"
 
 /*

diff --git a/src/autopick/autopick-registry.c b/src/autopick/autopick-registry.c
index c196599..0350089 100644 (file)
--- a/src/autopick/autopick-registry.c
+++ b/src/autopick/autopick-registry.c
@@ -11,7 +11,6 @@
 #include "autopick/autopick-reader-writer.h"
 #include "autopick/autopick-entry.h"
 #include "autopick/autopick-finder.h"
-#include "autopick/autopick-adder.h"
 #include "object-hook.h"
 #include "object/object-kind.h"
 #include "object-flavor.h"

diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c
index deb6bee..8b8b5a4 100644 (file)
--- a/src/autopick/autopick-util.c
+++ b/src/autopick/autopick-util.c
@@ -74,3 +74,23 @@ void auto_inscribe_item(player_type *player_ptr, object_type *o_ptr, int idx)
        player_ptr->window |= (PW_EQUIP | PW_INVEN);
        player_ptr->update |= (PU_BONUS);
 }
+
+
+/*
+ * 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-util.h b/src/autopick/autopick-util.h
index 4ba52b5..2a17ead 100644 (file)
--- a/src/autopick/autopick-util.h
+++ b/src/autopick/autopick-util.h
@@ -84,3 +84,4 @@ void autopick_free_entry(autopick_type *entry);
 void free_text_lines(concptr *lines_list);
 int get_com_id(char key);
 void auto_inscribe_item(player_type *player_ptr, object_type *o_ptr, int idx);
+void add_autopick_list(autopick_type *entry);