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

Use u_at macro

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
src/explode.c
View File

@@ -182,7 +182,7 @@ explode(
} else
explmask[i][j] = 0;
if (i + x - 1 == u.ux && j + y - 1 == u.uy) {
if (u_at(i + x - 1, j + y - 1)) {
switch (adtyp) {
case AD_PHYS:
explmask[i][j] = 0;
@@ -219,7 +219,7 @@ explode(
}
/* can be both you and mtmp if you're swallowed or riding */
mtmp = m_at(i + x - 1, j + y - 1);
if (!mtmp && i + x - 1 == u.ux && j + y - 1 == u.uy)
if (!mtmp && u_at(i + x - 1, j + y - 1))
mtmp = u.usteed;
if (mtmp) {
if (DEADMONSTER(mtmp))
@@ -327,7 +327,7 @@ explode(
for (j = 0; j < 3; j++) {
if (explmask[i][j] == 2)
continue;
if (i + x - 1 == u.ux && j + y - 1 == u.uy) {
if (u_at(i + x - 1, j + y - 1)) {
uhurt = (explmask[i][j] == 1) ? 1 : 2;
/* If the player is attacking via polyself into something
* with an explosion attack, leave them (and their gear)
@@ -348,7 +348,7 @@ explode(
&shopdamage, exploding_wand_typ);
mtmp = m_at(i + x - 1, j + y - 1);
if (!mtmp && i + x - 1 == u.ux && j + y - 1 == u.uy)
if (!mtmp && u_at(i + x - 1, j + y - 1))
mtmp = u.usteed;
if (!mtmp)
continue;
@@ -766,7 +766,7 @@ scatter(int sx, int sy, /* location of objects to scatter */
stmp->stopped = TRUE;
}
}
} else if (g.bhitpos.x == u.ux && g.bhitpos.y == u.uy) {
} else if (u_at(g.bhitpos.x, g.bhitpos.y)) {
if (scflags & MAY_HITYOU) {
int hitvalu, hitu;
@@ -836,8 +836,7 @@ scatter(int sx, int sy, /* location of objects to scatter */
newsym(x, y);
}
newsym(sx, sy);
if (sx == u.ux && sy == u.uy && u.uundetected
&& hides_under(g.youmonst.data))
if (u_at(sx, sy) && u.uundetected && hides_under(g.youmonst.data))
(void) hideunder(&g.youmonst);
if (lostgoods) /* implies shop_origin and therefore shkp valid */
credit_report(shkp, 1, FALSE);