From: nhmall <nhmall@nethack.org>
Date: Wed, 19 Jun 2019 01:50:51 +0000 (-0400)
Subject: merge bit
X-Git-Tag: NetHack-3.7.0_WIP~367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3640c3c2b200753bbff495a96e6e6ef5b2798e1a;p=nethack

merge bit
---

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))