From 754e9333f5982e14a3dd39743b787851a9221bd1 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 11 Mar 2023 10:49:53 -0800 Subject: [PATCH] fix pet picking something up while eating I don't know when this behavior started, but a pet who was eating something while standing on an item could pick that item while busy. This would be wrong even for pets that didn't need to use their mouth to do the picking up. This fix may be overly simplistic. It prevents the pickup-while- eating misbehavior but could possibly interfere with something else. --- include/monst.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/monst.h b/include/monst.h index 073de60be..854a6e137 100644 --- a/include/monst.h +++ b/include/monst.h @@ -1,4 +1,4 @@ -/* NetHack 3.7 monst.h $NHDT-Date: 1596498550 2020/08/03 23:49:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.42 $ */ +/* NetHack 3.7 monst.h $NHDT-Date: 1678560511 2023/03/11 18:48:31 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.54 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Robert Patrick Rankin, 2016. */ /* NetHack may be freely redistributed. See license for details. */ @@ -239,7 +239,7 @@ struct monst { ((m)->data->mlet == S_TROLL && (o) && (o)->oartifact == ART_TROLLSBANE) #define engulfing_u(mon) (u.uswallow && (u.ustuck == (mon))) -#define helpless(mon) ((mon)->msleeping || !(mon)->mcanmove) +#define helpless(mon) ((mon)->msleeping || !(mon)->mcanmove || (mon)->meating) /* Get the maximum difficulty monsters that can currently be generated, given the current level difficulty and the hero's level. */