#include "angband.h"\r
#include "object-hook.h"\r
#include "spells-summon.h"\r
+#include "artifact.h"\r
+#include "avatar.h"\r
+#include "player-status.h"\r
\r
/*!\r
* @brief 巻物を読むコマンドのサブルーチン\r
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
}\r
else if (o_ptr->tval==TV_PARCHMENT)\r
{\r
- cptr q;\r
+ concptr q;\r
GAME_TEXT o_name[MAX_NLEN];\r
char buf[1024];\r
screen_save();\r
{\r
object_type *o_ptr;\r
OBJECT_IDX item;\r
- cptr q, s;\r
+ concptr q, s;\r
\r
if (p_ptr->wild_mode)\r
{\r