From 3640c3c2b200753bbff495a96e6e6ef5b2798e1a Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 18 Jun 2019 21:50:51 -0400 Subject: [PATCH] merge bit --- include/mkroom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/mkroom.h b/include/mkroom.h index 9c8fcfd60..286c0c68d 100644 --- a/include/mkroom.h +++ b/include/mkroom.h @@ -88,7 +88,7 @@ enum roomtype_types { #define ROOMOFFSET 3 /* (levl[x][y].roomno - ROOMOFFSET) gives g.rooms[] index, * for inside-squares and non-shared boundaries */ -#define IS_ROOM_PTR(x) ((x) >= rooms && (x) < g.rooms + MAXNROFROOMS) +#define IS_ROOM_PTR(x) ((x) >= g.rooms && (x) < g.rooms + MAXNROFROOMS) #define IS_ROOM_INDEX(x) ((x) >= 0 && (x) < MAXNROFROOMS) #define IS_SUBROOM_PTR(x) ((x) >= g.subrooms && (x) < g.subrooms + MAXNROFROOMS) #define IS_SUBROOM_INDEX(x) ((x) > MAXNROFROOMS && (x) < (MAXNROFROOMS * 2))