rename IS_ROCK() macro to IS_OBSTRUCTED()
It has included trees since they were added, so give it a more fitting name.
This commit is contained in:
@@ -783,7 +783,7 @@ feel_location(coordxy x, coordxy y)
|
||||
* + Room/water positions
|
||||
* + Everything else (hallways!)
|
||||
*/
|
||||
if (IS_ROCK(lev->typ)
|
||||
if (IS_OBSTRUCTED(lev->typ)
|
||||
|| (IS_DOOR(lev->typ)
|
||||
&& (lev->doormask & (D_LOCKED | D_CLOSED)))) {
|
||||
map_background(x, y, 1);
|
||||
@@ -3101,7 +3101,7 @@ check_pos(coordxy x, coordxy y, int which)
|
||||
if (!isok(x, y))
|
||||
return which;
|
||||
type = levl[x][y].typ;
|
||||
if (IS_ROCK(type) || type == CORR || type == SCORR)
|
||||
if (IS_OBSTRUCTED(type) || type == CORR || type == SCORR)
|
||||
return which;
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user