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

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 20500a7..8e51770 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -151,6 +151,7 @@
     <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-matcher.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
@@ -299,6 +300,7 @@
     <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-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-util.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index dc93574..da54b3b 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -646,6 +646,9 @@
     <ClCompile Include="..\..\src\autopick\autopick-initializer.c">
       <Filter>autopick</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\autopick\autopick-matcher.c">
+      <Filter>autopick</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\gamevalue.h" />
@@ -1295,6 +1298,9 @@
     <ClInclude Include="..\..\src\autopick\autopick-initializer.h">
       <Filter>autopick</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\autopick\autopick-matcher.h">
+      <Filter>autopick</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

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

diff --git a/src/autopick/autopick-matcher.c b/src/autopick/autopick-matcher.c
new file mode 100644 (file)
index 0000000..b1c1ae7
--- /dev/null
+++ b/src/autopick/autopick-matcher.c
@@ -0,0 +1,362 @@
+/*!
+ * todo 300行以上の凶悪関数なので後で分割しておく
+ * @brief 床のアイテムが自動拾いに一致するかどうかを調べる関数だけを格納したファイル
+ * @date 2020/04/25
+ * @author Hourier
+ */
+
+#include "angband.h"
+#include "autopick/autopick-key-flag-process.h"
+#include "autopick/autopick-flags-table.h"
+#include "autopick/autopick-matcher.h"
+#include "object/object-kind.h"
+#include "object-hook.h"
+
+/*
+ * A function for Auto-picker/destroyer
+ * Examine whether the object matches to the entry
+ */
+bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_type *entry, concptr o_name)
+{
+       concptr ptr = entry->name;
+       if (IS_FLG(FLG_UNAWARE) && object_is_aware(o_ptr))
+               return FALSE;
+
+       if (IS_FLG(FLG_UNIDENTIFIED)
+               && (object_is_known(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
+               return FALSE;
+
+       if (IS_FLG(FLG_IDENTIFIED) && !object_is_known(o_ptr))
+               return FALSE;
+
+       if (IS_FLG(FLG_STAR_IDENTIFIED) &&
+               (!object_is_known(o_ptr) || !OBJECT_IS_FULL_KNOWN(o_ptr)))
+               return FALSE;
+
+       if (IS_FLG(FLG_BOOSTED))
+       {
+               object_kind *k_ptr = &k_info[o_ptr->k_idx];
+               if (!object_is_melee_weapon(o_ptr))
+                       return FALSE;
+
+               if ((o_ptr->dd == k_ptr->dd) && (o_ptr->ds == k_ptr->ds))
+                       return FALSE;
+
+               if (!object_is_known(o_ptr) && object_is_quest_target(o_ptr))
+               {
+                       return FALSE;
+               }
+       }
+
+       if (IS_FLG(FLG_MORE_DICE))
+       {
+               if (o_ptr->dd * o_ptr->ds < entry->dice)
+                       return FALSE;
+       }
+
+       if (IS_FLG(FLG_MORE_BONUS))
+       {
+               if (!object_is_known(o_ptr)) return FALSE;
+
+               if (o_ptr->pval)
+               {
+                       if (o_ptr->pval < entry->bonus) return FALSE;
+               }
+               else
+               {
+                       if (o_ptr->to_h < entry->bonus &&
+                               o_ptr->to_d < entry->bonus &&
+                               o_ptr->to_a < entry->bonus &&
+                               o_ptr->pval < entry->bonus)
+                               return FALSE;
+               }
+       }
+
+       if (IS_FLG(FLG_WORTHLESS) && object_value(o_ptr) > 0)
+               return FALSE;
+
+       if (IS_FLG(FLG_ARTIFACT))
+       {
+               if (!object_is_known(o_ptr) || !object_is_artifact(o_ptr))
+                       return FALSE;
+       }
+
+       if (IS_FLG(FLG_EGO))
+       {
+               if (!object_is_ego(o_ptr)) return FALSE;
+               if (!object_is_known(o_ptr) &&
+                       !((o_ptr->ident & IDENT_SENSE) && o_ptr->feeling == FEEL_EXCELLENT))
+                       return FALSE;
+       }
+
+       if (IS_FLG(FLG_GOOD))
+       {
+               if (!object_is_equipment(o_ptr)) return FALSE;
+               if (object_is_known(o_ptr))
+               {
+                       if (!object_is_nameless(o_ptr))
+                               return FALSE;
+
+                       if (o_ptr->to_a <= 0 && (o_ptr->to_h + o_ptr->to_d) <= 0)
+                               return FALSE;
+               }
+               else if (o_ptr->ident & IDENT_SENSE)
+               {
+                       switch (o_ptr->feeling)
+                       {
+                       case FEEL_GOOD:
+                               break;
+
+                       default:
+                               return FALSE;
+                       }
+               }
+               else
+               {
+                       return FALSE;
+               }
+       }
+
+       if (IS_FLG(FLG_NAMELESS))
+       {
+               if (!object_is_equipment(o_ptr)) return FALSE;
+               if (object_is_known(o_ptr))
+               {
+                       if (!object_is_nameless(o_ptr))
+                               return FALSE;
+               }
+               else if (o_ptr->ident & IDENT_SENSE)
+               {
+                       switch (o_ptr->feeling)
+                       {
+                       case FEEL_AVERAGE:
+                       case FEEL_GOOD:
+                       case FEEL_BROKEN:
+                       case FEEL_CURSED:
+                               break;
+
+                       default:
+                               return FALSE;
+                       }
+               }
+               else
+               {
+                       return FALSE;
+               }
+       }
+
+       if (IS_FLG(FLG_AVERAGE))
+       {
+               if (!object_is_equipment(o_ptr)) return FALSE;
+               if (object_is_known(o_ptr))
+               {
+                       if (!object_is_nameless(o_ptr))
+                               return FALSE;
+
+                       if (object_is_cursed(o_ptr) || object_is_broken(o_ptr))
+                               return FALSE;
+
+                       if (o_ptr->to_a > 0 || (o_ptr->to_h + o_ptr->to_d) > 0)
+                               return FALSE;
+               }
+               else if (o_ptr->ident & IDENT_SENSE)
+               {
+                       switch (o_ptr->feeling)
+                       {
+                       case FEEL_AVERAGE:
+                               break;
+
+                       default:
+                               return FALSE;
+                       }
+               }
+               else
+               {
+                       return FALSE;
+               }
+       }
+
+       if (IS_FLG(FLG_RARE) && !object_is_rare(o_ptr))
+               return FALSE;
+
+       if (IS_FLG(FLG_COMMON) && object_is_rare(o_ptr))
+               return FALSE;
+
+       if (IS_FLG(FLG_WANTED) && !object_is_bounty(o_ptr))
+               return FALSE;
+
+       if (IS_FLG(FLG_UNIQUE) &&
+               ((o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_STATUE) ||
+                       !(r_info[o_ptr->pval].flags1 & RF1_UNIQUE)))
+               return FALSE;
+
+       if (IS_FLG(FLG_HUMAN) &&
+               (o_ptr->tval != TV_CORPSE ||
+                       !my_strchr("pht", r_info[o_ptr->pval].d_char)))
+               return FALSE;
+
+       if (IS_FLG(FLG_UNREADABLE) &&
+               (o_ptr->tval < TV_LIFE_BOOK ||
+                       check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)))
+               return FALSE;
+
+       if (IS_FLG(FLG_REALM1) &&
+               (REALM1_BOOK != o_ptr->tval ||
+                       player_ptr->pclass == CLASS_SORCERER ||
+                       player_ptr->pclass == CLASS_RED_MAGE))
+               return FALSE;
+
+       if (IS_FLG(FLG_REALM2) &&
+               (REALM2_BOOK != o_ptr->tval ||
+                       player_ptr->pclass == CLASS_SORCERER ||
+                       player_ptr->pclass == CLASS_RED_MAGE))
+               return FALSE;
+
+       if (IS_FLG(FLG_FIRST) &&
+               (o_ptr->tval < TV_LIFE_BOOK || 0 != o_ptr->sval))
+               return FALSE;
+
+       if (IS_FLG(FLG_SECOND) &&
+               (o_ptr->tval < TV_LIFE_BOOK || 1 != o_ptr->sval))
+               return FALSE;
+
+       if (IS_FLG(FLG_THIRD) &&
+               (o_ptr->tval < TV_LIFE_BOOK || 2 != o_ptr->sval))
+               return FALSE;
+
+       if (IS_FLG(FLG_FOURTH) &&
+               (o_ptr->tval < TV_LIFE_BOOK || 3 != o_ptr->sval))
+               return FALSE;
+
+       if (IS_FLG(FLG_WEAPONS))
+       {
+               if (!object_is_weapon(o_ptr))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_FAVORITE_WEAPONS))
+       {
+               if (!object_is_favorite(o_ptr))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_ARMORS))
+       {
+               if (!object_is_armour(o_ptr))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_MISSILES))
+       {
+               if (!object_is_ammo(o_ptr)) return FALSE;
+       }
+       else if (IS_FLG(FLG_DEVICES))
+       {
+               switch (o_ptr->tval)
+               {
+               case TV_SCROLL: case TV_STAFF: case TV_WAND: case TV_ROD:
+                       break;
+               default: return FALSE;
+               }
+       }
+       else if (IS_FLG(FLG_LIGHTS))
+       {
+               if (!(o_ptr->tval == TV_LITE))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_JUNKS))
+       {
+               switch (o_ptr->tval)
+               {
+               case TV_SKELETON: case TV_BOTTLE:
+               case TV_JUNK: case TV_STATUE:
+                       break;
+               default: return FALSE;
+               }
+       }
+       else if (IS_FLG(FLG_CORPSES))
+       {
+               if (o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_SKELETON)
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_SPELLBOOKS))
+       {
+               if (!(o_ptr->tval >= TV_LIFE_BOOK))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_HAFTED))
+       {
+               if (!(o_ptr->tval == TV_HAFTED))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_SHIELDS))
+       {
+               if (!(o_ptr->tval == TV_SHIELD))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_BOWS))
+       {
+               if (!(o_ptr->tval == TV_BOW))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_RINGS))
+       {
+               if (!(o_ptr->tval == TV_RING))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_AMULETS))
+       {
+               if (!(o_ptr->tval == TV_AMULET))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_SUITS))
+       {
+               if (!(o_ptr->tval == TV_DRAG_ARMOR ||
+                       o_ptr->tval == TV_HARD_ARMOR ||
+                       o_ptr->tval == TV_SOFT_ARMOR))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_CLOAKS))
+       {
+               if (!(o_ptr->tval == TV_CLOAK))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_HELMS))
+       {
+               if (!(o_ptr->tval == TV_CROWN || o_ptr->tval == TV_HELM))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_GLOVES))
+       {
+               if (!(o_ptr->tval == TV_GLOVES))
+                       return FALSE;
+       }
+       else if (IS_FLG(FLG_BOOTS))
+       {
+               if (!(o_ptr->tval == TV_BOOTS))
+                       return FALSE;
+       }
+
+       if (*ptr == '^')
+       {
+               ptr++;
+               if (strncmp(o_name, ptr, strlen(ptr))) return FALSE;
+       }
+       else
+       {
+               if (!my_strstr(o_name, ptr)) return FALSE;
+       }
+
+       if (!IS_FLG(FLG_COLLECTING)) return TRUE;
+
+       for (int j = 0; j < INVEN_PACK; j++)
+       {
+               /*
+                * 'Collecting' means the item must be absorbed
+                * into an inventory slot.
+                * But an item can not be absorbed into itself!
+                */
+               if ((&player_ptr->inventory_list[j] != o_ptr) &&
+                       object_similar(&player_ptr->inventory_list[j], o_ptr))
+                       return TRUE;
+       }
+
+       return FALSE;
+}

diff --git a/src/autopick/autopick-matcher.h b/src/autopick/autopick-matcher.h
new file mode 100644 (file)
index 0000000..5d8e452
--- /dev/null
+++ b/src/autopick/autopick-matcher.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "autopick/autopick-util.h"
+
+bool is_autopick_match(player_type *player_ptr, object_type *o_ptr, autopick_type *entry, concptr o_name);

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index e34e38f..a0b7f0e 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -18,6 +18,7 @@
 #include "autopick/autopick-flags-table.h"
 #include "autopick/autopick-initializer.h"
 #include "autopick/autopick-key-flag-process.h"
+#include "autopick/autopick-matcher.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "autopick/autopick-methods-table.h"
 #include "autopick/autopick-keys-table.h"
@@ -173,356 +174,6 @@ void process_autopick_file_command(char *buf)
 
 /*
  * A function for Auto-picker/destroyer
- * Examine whether the object matches to the entry
- */
-static bool is_autopick_aux(player_type *player_ptr, object_type *o_ptr, autopick_type *entry, concptr o_name)
-{
-       concptr ptr = entry->name;
-       if (IS_FLG(FLG_UNAWARE) && object_is_aware(o_ptr))
-               return FALSE;
-
-       if (IS_FLG(FLG_UNIDENTIFIED)
-               && (object_is_known(o_ptr) || (o_ptr->ident & IDENT_SENSE)))
-               return FALSE;
-
-       if (IS_FLG(FLG_IDENTIFIED) && !object_is_known(o_ptr))
-               return FALSE;
-
-       if (IS_FLG(FLG_STAR_IDENTIFIED) &&
-               (!object_is_known(o_ptr) || !OBJECT_IS_FULL_KNOWN(o_ptr)))
-               return FALSE;
-
-       if (IS_FLG(FLG_BOOSTED))
-       {
-               object_kind *k_ptr = &k_info[o_ptr->k_idx];
-               if (!object_is_melee_weapon(o_ptr))
-                       return FALSE;
-
-               if ((o_ptr->dd == k_ptr->dd) && (o_ptr->ds == k_ptr->ds))
-                       return FALSE;
-
-               if (!object_is_known(o_ptr) && object_is_quest_target(o_ptr))
-               {
-                       return FALSE;
-               }
-       }
-
-       if (IS_FLG(FLG_MORE_DICE))
-       {
-               if (o_ptr->dd * o_ptr->ds < entry->dice)
-                       return FALSE;
-       }
-
-       if (IS_FLG(FLG_MORE_BONUS))
-       {
-               if (!object_is_known(o_ptr)) return FALSE;
-
-               if (o_ptr->pval)
-               {
-                       if (o_ptr->pval < entry->bonus) return FALSE;
-               }
-               else
-               {
-                       if (o_ptr->to_h < entry->bonus &&
-                               o_ptr->to_d < entry->bonus &&
-                               o_ptr->to_a < entry->bonus &&
-                               o_ptr->pval < entry->bonus)
-                               return FALSE;
-               }
-       }
-
-       if (IS_FLG(FLG_WORTHLESS) && object_value(o_ptr) > 0)
-               return FALSE;
-
-       if (IS_FLG(FLG_ARTIFACT))
-       {
-               if (!object_is_known(o_ptr) || !object_is_artifact(o_ptr))
-                       return FALSE;
-       }
-
-       if (IS_FLG(FLG_EGO))
-       {
-               if (!object_is_ego(o_ptr)) return FALSE;
-               if (!object_is_known(o_ptr) &&
-                       !((o_ptr->ident & IDENT_SENSE) && o_ptr->feeling == FEEL_EXCELLENT))
-                       return FALSE;
-       }
-
-       if (IS_FLG(FLG_GOOD))
-       {
-               if (!object_is_equipment(o_ptr)) return FALSE;
-               if (object_is_known(o_ptr))
-               {
-                       if (!object_is_nameless(o_ptr))
-                               return FALSE;
-
-                       if (o_ptr->to_a <= 0 && (o_ptr->to_h + o_ptr->to_d) <= 0)
-                               return FALSE;
-               }
-               else if (o_ptr->ident & IDENT_SENSE)
-               {
-                       switch (o_ptr->feeling)
-                       {
-                       case FEEL_GOOD:
-                               break;
-
-                       default:
-                               return FALSE;
-                       }
-               }
-               else
-               {
-                       return FALSE;
-               }
-       }
-
-       if (IS_FLG(FLG_NAMELESS))
-       {
-               if (!object_is_equipment(o_ptr)) return FALSE;
-               if (object_is_known(o_ptr))
-               {
-                       if (!object_is_nameless(o_ptr))
-                               return FALSE;
-               }
-               else if (o_ptr->ident & IDENT_SENSE)
-               {
-                       switch (o_ptr->feeling)
-                       {
-                       case FEEL_AVERAGE:
-                       case FEEL_GOOD:
-                       case FEEL_BROKEN:
-                       case FEEL_CURSED:
-                               break;
-
-                       default:
-                               return FALSE;
-                       }
-               }
-               else
-               {
-                       return FALSE;
-               }
-       }
-
-       if (IS_FLG(FLG_AVERAGE))
-       {
-               if (!object_is_equipment(o_ptr)) return FALSE;
-               if (object_is_known(o_ptr))
-               {
-                       if (!object_is_nameless(o_ptr))
-                               return FALSE;
-
-                       if (object_is_cursed(o_ptr) || object_is_broken(o_ptr))
-                               return FALSE;
-
-                       if (o_ptr->to_a > 0 || (o_ptr->to_h + o_ptr->to_d) > 0)
-                               return FALSE;
-               }
-               else if (o_ptr->ident & IDENT_SENSE)
-               {
-                       switch (o_ptr->feeling)
-                       {
-                       case FEEL_AVERAGE:
-                               break;
-
-                       default:
-                               return FALSE;
-                       }
-               }
-               else
-               {
-                       return FALSE;
-               }
-       }
-
-       if (IS_FLG(FLG_RARE) && !object_is_rare(o_ptr))
-               return FALSE;
-
-       if (IS_FLG(FLG_COMMON) && object_is_rare(o_ptr))
-               return FALSE;
-
-       if (IS_FLG(FLG_WANTED) && !object_is_bounty(o_ptr))
-               return FALSE;
-
-       if (IS_FLG(FLG_UNIQUE) &&
-               ((o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_STATUE) ||
-                       !(r_info[o_ptr->pval].flags1 & RF1_UNIQUE)))
-               return FALSE;
-
-       if (IS_FLG(FLG_HUMAN) &&
-               (o_ptr->tval != TV_CORPSE ||
-                       !my_strchr("pht", r_info[o_ptr->pval].d_char)))
-               return FALSE;
-
-       if (IS_FLG(FLG_UNREADABLE) &&
-               (o_ptr->tval < TV_LIFE_BOOK ||
-                       check_book_realm(player_ptr, o_ptr->tval, o_ptr->sval)))
-               return FALSE;
-
-       if (IS_FLG(FLG_REALM1) &&
-               (REALM1_BOOK != o_ptr->tval ||
-                       player_ptr->pclass == CLASS_SORCERER ||
-                       player_ptr->pclass == CLASS_RED_MAGE))
-               return FALSE;
-
-       if (IS_FLG(FLG_REALM2) &&
-               (REALM2_BOOK != o_ptr->tval ||
-                       player_ptr->pclass == CLASS_SORCERER ||
-                       player_ptr->pclass == CLASS_RED_MAGE))
-               return FALSE;
-
-       if (IS_FLG(FLG_FIRST) &&
-               (o_ptr->tval < TV_LIFE_BOOK || 0 != o_ptr->sval))
-               return FALSE;
-
-       if (IS_FLG(FLG_SECOND) &&
-               (o_ptr->tval < TV_LIFE_BOOK || 1 != o_ptr->sval))
-               return FALSE;
-
-       if (IS_FLG(FLG_THIRD) &&
-               (o_ptr->tval < TV_LIFE_BOOK || 2 != o_ptr->sval))
-               return FALSE;
-
-       if (IS_FLG(FLG_FOURTH) &&
-               (o_ptr->tval < TV_LIFE_BOOK || 3 != o_ptr->sval))
-               return FALSE;
-
-       if (IS_FLG(FLG_WEAPONS))
-       {
-               if (!object_is_weapon(o_ptr))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_FAVORITE_WEAPONS))
-       {
-               if (!object_is_favorite(o_ptr))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_ARMORS))
-       {
-               if (!object_is_armour(o_ptr))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_MISSILES))
-       {
-               if (!object_is_ammo(o_ptr)) return FALSE;
-       }
-       else if (IS_FLG(FLG_DEVICES))
-       {
-               switch (o_ptr->tval)
-               {
-               case TV_SCROLL: case TV_STAFF: case TV_WAND: case TV_ROD:
-                       break;
-               default: return FALSE;
-               }
-       }
-       else if (IS_FLG(FLG_LIGHTS))
-       {
-               if (!(o_ptr->tval == TV_LITE))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_JUNKS))
-       {
-               switch (o_ptr->tval)
-               {
-               case TV_SKELETON: case TV_BOTTLE:
-               case TV_JUNK: case TV_STATUE:
-                       break;
-               default: return FALSE;
-               }
-       }
-       else if (IS_FLG(FLG_CORPSES))
-       {
-               if (o_ptr->tval != TV_CORPSE && o_ptr->tval != TV_SKELETON)
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_SPELLBOOKS))
-       {
-               if (!(o_ptr->tval >= TV_LIFE_BOOK))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_HAFTED))
-       {
-               if (!(o_ptr->tval == TV_HAFTED))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_SHIELDS))
-       {
-               if (!(o_ptr->tval == TV_SHIELD))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_BOWS))
-       {
-               if (!(o_ptr->tval == TV_BOW))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_RINGS))
-       {
-               if (!(o_ptr->tval == TV_RING))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_AMULETS))
-       {
-               if (!(o_ptr->tval == TV_AMULET))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_SUITS))
-       {
-               if (!(o_ptr->tval == TV_DRAG_ARMOR ||
-                       o_ptr->tval == TV_HARD_ARMOR ||
-                       o_ptr->tval == TV_SOFT_ARMOR))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_CLOAKS))
-       {
-               if (!(o_ptr->tval == TV_CLOAK))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_HELMS))
-       {
-               if (!(o_ptr->tval == TV_CROWN || o_ptr->tval == TV_HELM))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_GLOVES))
-       {
-               if (!(o_ptr->tval == TV_GLOVES))
-                       return FALSE;
-       }
-       else if (IS_FLG(FLG_BOOTS))
-       {
-               if (!(o_ptr->tval == TV_BOOTS))
-                       return FALSE;
-       }
-
-       if (*ptr == '^')
-       {
-               ptr++;
-               if (strncmp(o_name, ptr, strlen(ptr))) return FALSE;
-       }
-       else
-       {
-               if (!my_strstr(o_name, ptr)) return FALSE;
-       }
-
-       if (!IS_FLG(FLG_COLLECTING)) return TRUE;
-
-       for (int j = 0; j < INVEN_PACK; j++)
-       {
-               /*
-                * 'Collecting' means the item must be absorbed
-                * into an inventory slot.
-                * But an item can not be absorbed into itself!
-                */
-               if ((&player_ptr->inventory_list[j] != o_ptr) &&
-                       object_similar(&player_ptr->inventory_list[j], o_ptr))
-                       return TRUE;
-       }
-
-       return FALSE;
-}
-
-
-/*
- * A function for Auto-picker/destroyer
  * Examine whether the object matches to the list of keywords or not.
  */
 int is_autopick(player_type *player_ptr, object_type *o_ptr)
@@ -535,7 +186,7 @@ int is_autopick(player_type *player_ptr, object_type *o_ptr)
        for (int i = 0; i < max_autopick; i++)
        {
                autopick_type *entry = &autopick_list[i];
-               if (is_autopick_aux(player_ptr, o_ptr, entry, o_name))
+               if (is_autopick_match(player_ptr, o_ptr, entry, o_name))
                        return i;
        }
 
@@ -2236,7 +1887,7 @@ static void search_for_object(player_type *player_ptr, text_body_type *tb, objec
 
                if (!autopick_new_entry(entry, tb->lines_list[i], FALSE)) continue;
 
-               match = is_autopick_aux(player_ptr, o_ptr, entry, o_name);
+               match = is_autopick_match(player_ptr, o_ptr, entry, o_name);
                autopick_free_entry(entry);
                if (!match)     continue;