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

controlling u.ustuck

Browse Source 
Setting or clearing u.ustuck now requires that context.botl be set,
so make a new routine to take care of both instead of manipulating
that pointer directly.
This commit is contained in:
PatR
2020-02-16 13:04:12 -08:00
parent c7ec28f4c7
commit 3981e3e6e5
15 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/polyself.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 polyself.c $NHDT-Date: 1579660157 2020/01/22 02:29:17 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.149 $ */
/* NetHack 3.6 polyself.c $NHDT-Date: 1581886864 2020/02/16 21:01:04 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.150 $ */
/* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */
@@ -767,7 +767,7 @@ int mntmp;
grabber to engulfer or vice versa because engulfing by poly'd hero
always ends immediately so won't be in effect during a polymorph] */
if (!sticky && !u.uswallow && u.ustuck && sticks(g.youmonst.data))
u.ustuck = 0;
set_ustuck((struct monst *) 0);
else if (sticky && !sticks(g.youmonst.data))
uunstick();
@@ -1622,12 +1622,14 @@ domindblast()
void
uunstick()
{
if (!u.ustuck) {
struct monst *mtmp = u.ustuck;
if (!mtmp) {
impossible("uunstick: no ustuck?");
return;
}
pline("%s is no longer in your clutches.", Monnam(u.ustuck));
u.ustuck = 0;
set_ustuck((struct monst *) 0); /* before pline() */
pline("%s is no longer in your clutches.", Monnam(mtmp));
}
void