*/
#include "monster-attack/monster-eating.h"
-#include "floor/floor.h"
+#include "core/player-redraw-types.h"
+#include "core/player-update-types.h"
+#include "core/window-redrawer.h"
+#include "flavor/flavor-describer.h"
+#include "flavor/object-flavor-types.h"
#include "inventory/inventory-object.h"
+#include "inventory/inventory-slot-types.h"
#include "mind/mind-mirror-master.h"
-#include "object/object-flavor.h"
+#include "monster/monster-status.h"
+#include "object-hook/hook-enchant.h"
#include "object/object-generator.h"
-#include "object/object-hook.h"
+#include "object/object-info.h"
#include "object/object-mark-types.h"
-#include "player/avatar.h"
+#include "player-info/avatar.h"
#include "player/mimic-info-table.h"
-#include "player/player-effects.h"
+#include "player/player-status-table.h"
+#include "status/experience.h"
+#include "system/floor-type-definition.h"
+#include "view/display-messages.h"
#include "world/world-object.h"
void process_eat_gold(player_type *target_ptr, monap_type *monap_ptr)
*/
bool check_eat_item(player_type *target_ptr, monap_type *monap_ptr)
{
- if (MON_CONFUSED(monap_ptr->m_ptr))
+ if (monster_confused_remaining(monap_ptr->m_ptr))
return FALSE;
if (target_ptr->is_dead || check_multishadow(target_ptr))
if (object_is_artifact(monap_ptr->o_ptr))
continue;
- object_desc(target_ptr, monap_ptr->o_name, monap_ptr->o_ptr, OD_OMIT_PREFIX);
+ describe_flavor(target_ptr, monap_ptr->o_name, monap_ptr->o_ptr, OD_OMIT_PREFIX);
#ifdef JP
msg_format("%s(%c)を%s盗まれた!", monap_ptr->o_name, index_to_label(i_idx), ((monap_ptr->o_ptr->number > 1) ? "一つ" : ""));
#else
if ((monap_ptr->o_ptr->tval != TV_FOOD) && !((monap_ptr->o_ptr->tval == TV_CORPSE) && (monap_ptr->o_ptr->sval)))
continue;
- object_desc(target_ptr, monap_ptr->o_name, monap_ptr->o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+ describe_flavor(target_ptr, monap_ptr->o_name, monap_ptr->o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
#ifdef JP
msg_format("%s(%c)を%s食べられてしまった!", monap_ptr->o_name, index_to_label(i_idx), ((monap_ptr->o_ptr->number > 1) ? "一つ" : ""));
#else