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

Add 'mdistu' macro

Browse Source 
Short for distu(mtmp->mx, mtmp->my) (i.e. the distance between the hero
and the specified monster), which is a very common use of distu().  The
idea is that this would be a convenient shorthand for it; I actually
thought it (or something very similar) existed already, but couldn't
find it when I tried to use it earlier.  Based on the number of uses of
fully-spelled-out 'distu(mtmp->mx, mtmp->my)' replaced in this commit
I'm guessing I just imagined it.
This commit is contained in:
Michael Meyer
2022-11-14 18:37:17 -05:00
committed by PatR
parent a0dfc94bbe
commit 619781dbb8
19 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mon.c
View File

@@ -1053,7 +1053,7 @@ movemon_singlemon(struct monst *mtmp)
* have died if it returns 1.
*/
if (cansee(mtmp->mx, mtmp->my)
&& (distu(mtmp->mx, mtmp->my) <= BOLT_LIM * BOLT_LIM)
&& (mdistu(mtmp) <= BOLT_LIM * BOLT_LIM)
&& fightm(mtmp))
return FALSE; /* mon might have died */
}
@@ -2988,7 +2988,7 @@ set_ustuck(struct monst *mtmp)
if (iflags.sanity_check || iflags.debug_fuzzer) {
if (mtmp && !next2u(mtmp->mx, mtmp->my))
impossible("Sticking to %s at distu %d?",
mon_nam(mtmp), distu(mtmp->mx, mtmp->my));
mon_nam(mtmp), mdistu(mtmp));
}
g.context.botl = 1;
@@ -4212,7 +4212,7 @@ decide_to_shapeshift(struct monst *mon, int shiftflags)
} else if (mon->data == &mons[PM_FOG_CLOUD]
&& mon->mhp == mon->mhpmax && !rn2(4)
&& (!canseemon(mon)
|| distu(mon->mx, mon->my) > BOLT_LIM * BOLT_LIM)) {
|| mdistu(mon) > BOLT_LIM * BOLT_LIM)) {
/* if a fog cloud, maybe change to wolf or vampire bat;
those are more likely to take damage--at least when
tame--and then switch back to vampire; they'll also
@@ -4234,7 +4234,7 @@ decide_to_shapeshift(struct monst *mon, int shiftflags)
} else {
if (mon->mhp >= 9 * mon->mhpmax / 10 && !rn2(6)
&& (!canseemon(mon)
|| distu(mon->mx, mon->my) > BOLT_LIM * BOLT_LIM))
|| mdistu(mon) > BOLT_LIM * BOLT_LIM))
dochng = TRUE; /* 'ptr' stays Null */
}
}