\r
#include "angband.h"\r
#include "object-hook.h"\r
+#include "avatar.h"\r
+#include "spells-status.h"\r
+#include "realm-hex.h"\r
+#include "player-status.h"\r
\r
/*!\r
* @brief 食料を食べるコマンドのサブルーチン\r
\r
sound(SOUND_EAT);\r
\r
- p_ptr->energy_use = 100;\r
+ take_turn(p_ptr, 100);;\r
\r
/* Identity not known yet */\r
ident = FALSE;\r
\r
}\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
if (!(object_is_aware(o_ptr)))\r
{\r
prace_is_(RACE_SPECTRE)) &&\r
(o_ptr->tval == TV_STAFF || o_ptr->tval == TV_WAND))\r
{\r
- cptr staff;\r
+ concptr staff;\r
\r
if (o_ptr->tval == TV_STAFF &&\r
(item < 0) && (o_ptr->number > 1))\r
{\r
msg_format(_("この%sにはもう魔力が残っていない。", "The %s has no charges left."), staff);\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
void do_cmd_eat_food(void)\r
{\r
OBJECT_IDX item;\r
- cptr q, s;\r
-\r
+ concptr q, s;\r
\r
if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))\r
{\r
q = _("どれを食べますか? ", "Eat which item? ");\r
s = _("食べ物がない。", "You have nothing to eat.");\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
/* Eat the object */\r
do_cmd_eat_food_aux(item);\r