nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix: message when pet moves from water to eat

Browse Source 
The <x,y> params of dog_eat are the pet's starting position that turn,
not necessarily the position of the object being eaten.  If the pet is
doing a combined move-and-eat action, <x,y> will be its original spot,
but it will have already moved to <mtmp->mx,mtmp->my>, where the food
object also is.

The attempt to check whether the eating was happening out-of-sight
underwater (to suppress the message in that case) was checking the pet's
starting location, not its new location/the location of the food object.
So if a pet moved from water to land to eat something, the chowing-down
message would be improperly suppressed (and presumably the message for a
pet moving from land to water to eat would be improperly left
_un_suppressed, though I didn't actually try to reproduce that).
This commit is contained in:
Michael Meyer
2023-02-13 14:21:44 -05:00
committed by Pasi Kallinen
parent 6e1016be45
commit 3890491ef0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dogmove.c
View File

@@ -260,7 +260,7 @@ dog_eat(struct monst *mtmp,
obj = splitobj(obj, 1L);
if (obj->unpaid)
iflags.suppress_price++;
if (is_pool(x, y) && !Underwater) {
if (is_pool(mtmp->mx, mtmp->my) && !Underwater) {
/* Don't print obj */
/* TODO: Reveal presence of sea monster (especially sharks) */
} else {