キーワード「得意武器」で、射撃武器がマッチしてしまっていたバグ修正。

diff --git a/src/autopick.c b/src/autopick.c
index b75ffee..a879c3b 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -438,9 +438,14 @@ static bool autopick_new_entry(autopick_type *entry, cptr str, bool allow_defaul
  */
 static bool is_favorite(object_type *o_ptr)
 {
-       /* Only weapons match */
-       if (!(TV_WEAPON_BEGIN <= o_ptr->tval && o_ptr->tval <= TV_WEAPON_END))
+       /* Only melee weapons match */
+       if (!(o_ptr->tval == TV_POLEARM ||
+             o_ptr->tval == TV_SWORD ||
+             o_ptr->tval == TV_DIGGING ||
+             o_ptr->tval == TV_HAFTED))
+       {
                return FALSE;
+       }
 
        /* Favorite weapons are varied depend on the class */
        switch (p_ptr->pclass)