[Refactor] #37353 コメント整理。 / Refactor comments.

[hengband/hengband.git] / src / cmd-eat.c

diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index 4e3883c..a729874 100644 (file)
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -9,6 +9,7 @@
 \r
 #include "angband.h"\r
 #include "object-hook.h"\r
+#include "avatar.h"\r
 \r
 /*!\r
  * @brief 食料を食べるコマンドのサブルーチン\r
@@ -296,9 +297,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 \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
@@ -338,7 +337,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
                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
@@ -353,9 +352,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
                {\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
@@ -498,8 +495,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 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
@@ -512,7 +508,7 @@ void do_cmd_eat_food(void)
        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