X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fcmd-eat.c;h=db3179fc0bd239eaa02f92faff3cad4f2bc4a0a8;hb=d891e1b8ec7d3661ef290ec0eb37eea793f7db9b;hp=c29c320e4c5ea14efab598348cc928a6ef880bd6;hpb=fa04e1963f8146023efa8bd35dc57412a338648a;p=hengband%2Fhengband.git

diff --git a/src/cmd-eat.c b/src/cmd-eat.c
index c29c320e4..db3179fc0 100644
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -298,7 +298,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 	}
 
 	/* Combine / Reorder the pack (later) */
-	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+	p_ptr->update |= (PU_COMBINE | PU_REORDER);
 
 	if (!(object_is_aware(o_ptr)))
 	{
@@ -355,7 +355,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 			o_ptr->ident |= (IDENT_EMPTY);
 
 			/* Combine / Reorder the pack (later) */
-			p_ptr->notice |= (PN_COMBINE | PN_REORDER);
+			p_ptr->update |= (PU_COMBINE | PU_REORDER);
 			p_ptr->window |= (PW_INVEN);
 
 			return;
@@ -374,8 +374,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 		{
 			object_type forge;
 			object_type *q_ptr;
-
-			/* Get local object */
 			q_ptr = &forge;
 
 			/* Obtain a local object */
@@ -418,7 +416,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 			my_strchr("pht", r_info[o_ptr->pval].d_char)))
 	{
 		/* Drain vitality of humanoids */
-		char o_name[MAX_NLEN];
+		GAME_TEXT o_name[MAX_NLEN];
 		object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 		msg_format(_("%sは燃え上り灰になった。精力を吸収した気がする。", "%^s is burnt to ashes.  You absorb its vitality!"), o_name);
 		(void)set_food(PY_FOOD_MAX - 1);
@@ -442,8 +440,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
 				object_type *q_ptr = &forge;
 
 				msg_print(_("食べ物がアゴを素通りして落ちた！", "The food falls through your jaws!"));
-
-				/* Create the item */
 				object_prep(q_ptr, lookup_kind(o_ptr->tval, o_ptr->sval));
 
 				/* Drop the object from heaven */
@@ -504,7 +500,6 @@ void do_cmd_eat_food(void)
 	OBJECT_IDX item;
 	cptr        q, s;
 
-
 	if (p_ptr->special_defense & (KATA_MUSOU | KATA_KOUKIJIN))
 	{
 		set_action(ACTION_NONE);
@@ -513,11 +508,10 @@ void do_cmd_eat_food(void)
 	/* Restrict choices to food */
 	item_tester_hook = item_tester_hook_eatable;
 
-	/* Get an item */
 	q = _("どれを食べますか? ", "Eat which item? ");
 	s = _("食べ物がない。", "You have nothing to eat.");
 
-	if (!get_item(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
+	if (!choose_object(&item, q, s, (USE_INVEN | USE_FLOOR))) return;
 
 	/* Eat the object */
 	do_cmd_eat_food_aux(item);