TV_EQUIP_BEGIN, TV_EQUIP_END を定義する時に、

「装備できるアイテム」の条件と、矢玉も含めた装備品の条件とを混同してしまっていたので、
新たにTV_WEARABLE_BEGIN, TV_WEARABLE_ENDを作ってちゃんと分けた。

diff --git a/src/cmd4.c b/src/cmd4.c
index f9a35b5..74e6208 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5637,7 +5637,7 @@ static void do_cmd_knowledge_inven_aux(FILE *fff, object_type *o_ptr, int *j, by
         * HACK:Ring of Lordly protection and Dragon equipment
         * have random resistances.
         */
-       if (((TV_EQUIP_BEGIN <= tval) && (tval <= TV_EQUIP_END) && o_ptr->name2)
+       if (((TV_WEARABLE_BEGIN <= tval) && (tval <= TV_WEARABLE_END) && o_ptr->name2)
            || ((tval == TV_AMULET) && (o_ptr->sval == SV_AMULET_RESISTANCE))
            || ((tval == TV_RING) && (o_ptr->sval == SV_RING_LORDLY))
            || ((tval == TV_SHIELD) && (o_ptr->sval == SV_DRAGON_SHIELD))
@@ -5749,7 +5749,7 @@ static void do_cmd_knowledge_inven(void)
        }
        fprintf(fff, "%s\n", inven_res_label);
 
-       for (tval = TV_EQUIP_BEGIN; tval <= TV_EQUIP_END; tval++)
+       for (tval = TV_WEARABLE_BEGIN; tval <= TV_WEARABLE_END; tval++)
        {
                if (j != 0)
                {

diff --git a/src/defines.h b/src/defines.h
index 043fbb2..4a7d2b7 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1780,14 +1780,16 @@
 #define TV_HISSATSU_BOOK 106
 #define TV_GOLD         127     /* Gold can only be picked up by players */
 
-#define TV_MISSILE_BEGIN TV_SHOT
-#define TV_MISSILE_END   TV_BOLT
-#define TV_EQUIP_BEGIN   TV_BOW
-#define TV_EQUIP_END     TV_CARD
-#define TV_WEAPON_BEGIN         TV_BOW
-#define TV_WEAPON_END           TV_SWORD
-#define TV_ARMOR_BEGIN          TV_BOOTS
-#define TV_ARMOR_END            TV_DRAG_ARMOR
+#define TV_EQUIP_BEGIN    TV_SHOT
+#define TV_EQUIP_END      TV_CARD
+#define TV_MISSILE_BEGIN  TV_SHOT
+#define TV_MISSILE_END    TV_BOLT
+#define TV_WEARABLE_BEGIN TV_BOW
+#define TV_WEARABLE_END   TV_CARD
+#define TV_WEAPON_BEGIN   TV_BOW
+#define TV_WEAPON_END     TV_SWORD
+#define TV_ARMOR_BEGIN    TV_BOOTS
+#define TV_ARMOR_END      TV_DRAG_ARMOR
 
 /* Any subvalue */
 #define SV_ANY                                         255