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

leash sanity checking

Browse Source 
I still haven't found any explanation for the report by a hardfought
player recently that going down some stairs with a pair of leashed
pets got one into a confused state where it was flagged as leashed
but the corresponding leash was no longer in use.

This adds some new object and monster sanity checks regarding leashes,
and it changes o_unleash(obj) to clear obj->leashmon even if/when the
monster can't be found.

It also changes behavior for dipping an attached leash into a potion
of polymorph when that happens to yield another leash--now the new
one will end up being pre-attached.
This commit is contained in:
PatR
2024-04-30 13:27:10 -07:00
parent 37a7e62be5
commit 6ebc3a7291
5 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/objnam.c
View File

@@ -1407,11 +1407,16 @@ doname_base(
if (obj->otyp == LEASH && obj->leashmon != 0) {
struct monst *mlsh = find_mid(obj->leashmon, FM_FMON);
if (!mlsh) {
impossible("leashed monster not on this level");
obj->leashmon = 0;
} else {
if (mlsh && !DEADMONSTER(mlsh)) {
ConcatF1(bp, 0, " (attached to %s)", noit_mon_nam(mlsh));
} else {
if (mlsh) /*&& DEADMONSTER(mlsh)*/
impossible("leashed %s #%u is dead",
mon_pmname(mlsh), (unsigned) obj->leashmon);
else
impossible("leashed monster #%u not found",
(unsigned) obj->leashmon);
obj->leashmon = 0;
}
break;
}