diff --git a/include/sect.h b/include/sect.h index d512ebaf..637d40ac 100644 --- a/include/sect.h +++ b/include/sect.h @@ -151,9 +151,8 @@ struct dchrstr { #define SCT_ENLIST 31 /* enlistment center */ #define SCT_PLAINS 32 /* plains sector */ #define SCT_BTOWER 33 /* Bridge tower */ -#define SCT_MAXDEF 33 /* highest sector type in header files */ -#define SCT_TYPE_MAX 39 +#define SCT_TYPE_MAX 38 #define getsect(x, y, p) ef_read(EF_SECTOR, sctoff((x), (y)), (p)) #define putsect(p) ef_write(EF_SECTOR, sctoff((p)->sct_x, (p)->sct_y), (p)) @@ -163,7 +162,7 @@ struct dchrstr { /* things relating to sectors */ extern int sctoff(coord x, coord y); -extern struct dchrstr dchr[SCT_TYPE_MAX + 1]; +extern struct dchrstr dchr[SCT_TYPE_MAX + 2]; extern struct dchrstr bigcity_dchr; #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG) diff --git a/src/lib/global/sect.c b/src/lib/global/sect.c index 41623968..1aae43c3 100644 --- a/src/lib/global/sect.c +++ b/src/lib/global/sect.c @@ -45,7 +45,7 @@ * Initialized on startup from sect.config and deity custom config (if any). * Terminated by a sentinel with null d_name. */ -struct dchrstr dchr[SCT_TYPE_MAX + 1]; +struct dchrstr dchr[SCT_TYPE_MAX + 2]; /* * Table of infrastructure types