case SV_SCROLL_CURSE_WEAPON:\r
{\r
k = 0;\r
- if (buki_motteruka(INVEN_RARM))\r
+ if (has_melee_weapon(INVEN_RARM))\r
{\r
k = INVEN_RARM;\r
- if (buki_motteruka(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;\r
+ if (has_melee_weapon(INVEN_LARM) && one_in_(2)) k = INVEN_LARM;\r
}\r
- else if (buki_motteruka(INVEN_LARM)) k = INVEN_LARM;\r
+ else if (has_melee_weapon(INVEN_LARM)) k = INVEN_LARM;\r
if (k && curse_weapon(FALSE, k)) ident = TRUE;\r
break;\r
}\r