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

Remove unnecessary macro that wasn't ideally named

Browse Source 
Also add a comment that states the intent.
This commit is contained in:
nhmall
2024-11-26 23:27:29 -05:00
parent 3615b17b62
commit 15e70035d0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rm.h
-1
View File
@@ -104,7 +104,6 @@ enum levl_typ_types {
#define IS_WALL(typ) ((typ) && (typ) <= DBWALL) #define IS_WALL(typ) ((typ) && (typ) <= DBWALL)
#define IS_STWALL(typ) ((typ) <= DBWALL) /* STONE <= (typ) <= DBWALL */ #define IS_STWALL(typ) ((typ) <= DBWALL) /* STONE <= (typ) <= DBWALL */
#define IS_OBSTRUCTED(typ) ((typ) < POOL) /* absolutely nonaccessible */ #define IS_OBSTRUCTED(typ) ((typ) < POOL) /* absolutely nonaccessible */
#define IS_CORR(typ) ((typ) == CORR || (typ) == SCORR)
#define IS_SDOOR(typ) ((typ) == SDOOR) #define IS_SDOOR(typ) ((typ) == SDOOR)
#define IS_DOOR(typ) ((typ) == DOOR) #define IS_DOOR(typ) ((typ) == DOOR)
#define IS_DOORJOIN(typ) (IS_OBSTRUCTED(typ) || (typ) == IRONBARS) #define IS_DOORJOIN(typ) (IS_OBSTRUCTED(typ) || (typ) == IRONBARS)
src/display.c
+2 -1
View File
@@ -3101,7 +3101,8 @@ check_pos(coordxy x, coordxy y, int which)
if (!isok(x, y)) if (!isok(x, y))
return which; return which;
type = levl[x][y].typ; type = levl[x][y].typ;
if (IS_STWALL(type) || IS_CORR(type) || IS_SDOOR(type)) /* Everything below POOL, excluding TREE */
if (IS_STWALL(type) || (type) == CORR || (type) == SCORR || IS_SDOOR(type))
return which; return which;
return 0; return 0;
} }