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

10
src/muse.c
View File

@@ -133,7 +133,7 @@ precheck(struct monst* mon, struct obj* obj)
? (BOLT_LIM + 1) : (BOLT_LIM - 3);
You_hear("a zap and an explosion %s.",
(distu(mon->mx, mon->my) <= range * range)
(mdistu(mon) <= range * range)
? "nearby" : "in the distance");
}
m_useup(mon, obj);
@@ -164,7 +164,7 @@ mzapwand(
int range = couldsee(mtmp->mx, mtmp->my) /* 9 or 5 */
? (BOLT_LIM + 1) : (BOLT_LIM - 3);
You_hear("a %s zap.", (distu(mtmp->mx, mtmp->my) <= range * range)
You_hear("a %s zap.", (mdistu(mtmp) <= range * range)
? "nearby" : "distant");
unknow_object(otmp); /* hero loses info when unseen obj is used */
} else if (self) {
@@ -192,8 +192,8 @@ mplayhorn(
? (BOLT_LIM + 1) : (BOLT_LIM - 3);
You_hear("a horn being played %s.",
(distu(mtmp->mx, mtmp->my) <= range * range)
? "nearby" : "in the distance");
(mdistu(mtmp) <= range * range)
? "nearby" : "in the distance");
unknow_object(otmp); /* hero loses info when unseen obj is used */
} else if (self) {
otmp->dknown = 1;
@@ -2063,7 +2063,7 @@ mloot_container(
takeout_count = 4;
break;
}
howfar = distu(mon->mx, mon->my);
howfar = mdistu(mon);
nearby = (howfar <= 7 * 7);
contnr_nam[0] = mpronounbuf[0] = '\0';
if (vismon) {