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

rename IS_ROCK() macro to IS_OBSTRUCTED()

Browse Source 
It has included trees since they were added, so give it a
more fitting name.
This commit is contained in:
nhmall
2024-11-09 11:12:42 -05:00
parent f1743d0e5c
commit 1dbba0f63b
23 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon.c
View File

@@ -2170,12 +2170,12 @@ mfndpos(
if (nx == x && ny == y)
continue;
ntyp = levl[nx][ny].typ;
if (IS_ROCK(ntyp)
if (IS_OBSTRUCTED(ntyp)
&& !((flag & ALLOW_WALL) && may_passwall(nx, ny))
&& !((IS_TREE(ntyp) ? treeok : rockok) && may_dig(nx, ny)))
continue;
/* intelligent peacefuls avoid digging shop/temple walls */
if (IS_ROCK(ntyp) && rockok
if (IS_OBSTRUCTED(ntyp) && rockok
&& !mindless(mon->data) && (mon->mpeaceful || mon->mtame)
&& (*in_rooms(nx, ny, TEMPLE) || *in_rooms(nx, ny, SHOPBASE))
&& !(*in_rooms(x, y, TEMPLE) || *in_rooms(x, y, SHOPBASE)))