const int times = randint1(powerful ? 8 : 4);\r
for (k = 0; k < times; k++)\r
{\r
- if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET)))\r
+ if (summon_specific(0, p_ptr->y, p_ptr->x, dun_level, 0, (PM_ALLOW_GROUP | PM_ALLOW_UNIQUE | PM_NO_PET), '\0'))\r
{\r
ident = TRUE;\r
}\r
o_ptr->ident |= (IDENT_EMPTY);\r
\r
/* Combine / Reorder the pack (later) */\r
- p_ptr->notice |= (PN_COMBINE | PN_REORDER);\r
+ p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
p_ptr->window |= (PW_INVEN);\r
\r
return;\r
}\r
\r
/* Combine / Reorder the pack (later) */\r
- p_ptr->notice |= (PN_COMBINE | PN_REORDER);\r
+ p_ptr->update |= (PU_COMBINE | PU_REORDER);\r
\r
/* Tried the item */\r
object_tried(o_ptr);\r
gain_exp((lev + (p_ptr->lev >> 1)) / p_ptr->lev);\r
}\r
\r
- /* Window stuff */\r
p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);\r
\r
\r
{\r
object_type forge;\r
object_type *q_ptr;\r
-\r
- /* Get local object */\r
q_ptr = &forge;\r
\r
/* Obtain a local object */\r
p_ptr->total_weight -= q_ptr->weight;\r
item = inven_carry(q_ptr);\r
\r
- /* Message */\r
msg_print(_("杖をまとめなおした。", "You unstack your staff."));\r
}\r
\r
void do_cmd_use_staff(void)\r
{\r
OBJECT_IDX item;\r
- cptr q, s;\r
+ concptr q, s;\r
+\r
+ if (p_ptr->wild_mode)\r
+ {\r
+ return;\r
+ }\r
+\r
+ if (p_ptr->inside_arena)\r
+ {\r
+ msg_print(_("アリーナが魔法を吸収した!", "The arena absorbs all attempted magic!"));\r
+ msg_print(NULL);\r
+ return;\r
+ }\r
\r
if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
{\r
/* Restrict choices to wands */\r
item_tester_tval = TV_STAFF;\r
\r
- /* Get an item */\r
q = _("どの杖を使いますか? ", "Use which staff? ");\r
s = _("使える杖がない。", "You have no staff to use.");\r
\r
- if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
+ if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;\r
\r
do_cmd_use_staff_aux(item);\r
}\r