fix grab/engulf by tame/peaceful monster (trunk only)

<Someone> reported being swallowed by his pet purple worm during
Conflict, then being stuck inside once Conflict ended.  I'm not entirely
sure what dog_move() intended by the "swallowed case handled above" comment.
It returns without letting the pet move when the distance between pet and
hero is 0; that wasn't much in the way of "handling" being swallowed.
Grabbing pets did let go, but peaceful monsters didn't until you actually
attempted to move away from them.  Now all four combinations (grabbed or
swallowed by tame or peaceful monster) are handled the same:  the monster
will let the hero go next time it gets a chance to try to move, using up
its move in the process.
This commit is contained in:
nethack.rankin
2006-08-17 04:35:08 +00:00
parent 2e8c4b08d4
commit e6bf8af74e
3 changed files with 31 additions and 13 deletions

View File

@@ -155,6 +155,7 @@ make region ttl field a long instead of short to get rid of lint warnings
pushing a boulder onto a level teleporter trap could issue repeat messages
if shopkeeper or priest gets teleported while inside his shop or temple,
give locations inside that room preference when choosing destination
tame/peaceful grabber/engulfer will release hero after conflict ends
Platform- and/or Interface-Specific Fixes