Use u_at macro

This commit is contained in:
Pasi Kallinen
2022-02-23 20:28:35 +02:00
parent 2635c60280
commit 8e91320d2f
40 changed files with 126 additions and 130 deletions

View File

@@ -570,7 +570,7 @@ dog_goal(register struct monst *mtmp, struct edog *edog,
&& g.moves < edog->hungrytime)) {
g.gx = u.ux;
g.gy = u.uy;
if (after && udist <= 4 && g.gx == u.ux && g.gy == u.uy)
if (after && udist <= 4 && u_at(g.gx, g.gy))
return -2;
appr = (udist >= 9) ? 1 : (mtmp->mflee) ? -1 : 0;
if (udist > 1) {
@@ -591,7 +591,7 @@ dog_goal(register struct monst *mtmp, struct edog *edog,
appr = 0;
#define FARAWAY (COLNO + 2) /* position outside screen */
if (g.gx == u.ux && g.gy == u.uy && !in_masters_sight) {
if (u_at(g.gx, g.gy) && !in_masters_sight) {
register coord *cp;
cp = gettrack(omx, omy);