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

more steadfast

Browse Source 
Make changes similar to the suggested patch from entrez:  support
for 'youmonst' as the monster passed to m_carrying().  This doesn't
change carrying(otyp) to call m_carrying(&g.youmonst,otyp) though.

Also, treat being on the Plane of Air or in an air bubble on the
Plane of Water similar to flying or levitating:  wielded Giantslayer
(or carried loadstone) doesn't prevent knockback there.
This commit is contained in:
PatR
2022-10-26 01:13:01 -07:00
parent 313cf1ccd8
commit 13fb141ddd
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mthrowu.c
View File

@@ -1182,22 +1182,23 @@ lined_up(register struct monst* mtmp)
return m_lined_up(&g.youmonst, mtmp) ? TRUE : FALSE;
}
/* check if a monster is carrying a particular item */
/* check if a monster is carrying an item of a particular type */
struct obj *
m_carrying(struct monst* mtmp, int type)
m_carrying(struct monst *mtmp, int type)
{
register struct obj *otmp;
for (otmp = mtmp->minvent; otmp; otmp = otmp->nobj)
for (otmp = (mtmp == &g.youmonst) ? g.invent : mtmp->minvent; otmp;
otmp = otmp->nobj)
if (otmp->otyp == type)
return otmp;
return (struct obj *) 0;
break;
return otmp;
}
void
hit_bars(
struct obj **objp, /* *objp will be set to NULL if object breaks */
coordxy objx, coordxy objy, /* hero's spot (when wielded) or missile's spot */
coordxy objx, coordxy objy, /* hero's (when wielded) or missile's spot */
coordxy barsx, coordxy barsy, /* adjacent spot where bars are located */
unsigned breakflags) /* breakage control */
{