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

10
src/sp_lev.c
View File

@@ -1291,7 +1291,7 @@ is_ok_location(coordxy x, coordxy y, getloc_flags_t humidity)
if (humidity & ANY_LOC)
return TRUE;
if ((humidity & SOLID) && IS_ROCK(typ))
if ((humidity & SOLID) && IS_OBSTRUCTED(typ))
return TRUE;
if ((humidity & (DRY|SPACELOC)) && SPACE_POS(typ)) {
@@ -1758,7 +1758,7 @@ create_door(room_door *dd, struct mkroom *broom)
y = broom->ly - 1;
x = broom->lx + ((dpos == -1) ? rn2(1 + broom->hx - broom->lx)
: dpos);
if (!isok(x, y - 1) || IS_ROCK(levl[x][y - 1].typ))
if (!isok(x, y - 1) || IS_OBSTRUCTED(levl[x][y - 1].typ))
continue;
break;
case 1:
@@ -1767,7 +1767,7 @@ create_door(room_door *dd, struct mkroom *broom)
y = broom->hy + 1;
x = broom->lx + ((dpos == -1) ? rn2(1 + broom->hx - broom->lx)
: dpos);
if (!isok(x, y + 1) || IS_ROCK(levl[x][y + 1].typ))
if (!isok(x, y + 1) || IS_OBSTRUCTED(levl[x][y + 1].typ))
continue;
break;
case 2:
@@ -1776,7 +1776,7 @@ create_door(room_door *dd, struct mkroom *broom)
x = broom->lx - 1;
y = broom->ly + ((dpos == -1) ? rn2(1 + broom->hy - broom->ly)
: dpos);
if (!isok(x - 1, y) || IS_ROCK(levl[x - 1][y].typ))
if (!isok(x - 1, y) || IS_OBSTRUCTED(levl[x - 1][y].typ))
continue;
break;
case 3:
@@ -1785,7 +1785,7 @@ create_door(room_door *dd, struct mkroom *broom)
x = broom->hx + 1;
y = broom->ly + ((dpos == -1) ? rn2(1 + broom->hy - broom->ly)
: dpos);
if (!isok(x + 1, y) || IS_ROCK(levl[x + 1][y].typ))
if (!isok(x + 1, y) || IS_OBSTRUCTED(levl[x + 1][y].typ))
continue;
break;
default: