X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Fsect.h;h=f7549a4ec02b2885d322e04ce91fa3509b3797d6;hp=aa60b58c037540984440ff9479bf60a719f4f6e7;hb=e7583a519e063bbf6b29343a173fd020b3ad6dca;hpb=6bad4643483d99a7e8cfa4251646ae7f162bfa1b diff --git a/include/sect.h b/include/sect.h index aa60b58c0..f7549a4ec 100644 --- a/include/sect.h +++ b/include/sect.h @@ -30,7 +30,7 @@ * Dave Pare * Ken Stevens, 1995 * Steve McClure, 1998 - * Markus Armbruster, 2004-2016 + * Markus Armbruster, 2004-2020 */ @@ -160,14 +160,14 @@ struct dchrstr { #define SCT_PLAINS 32 /* plains sector */ #define SCT_BTOWER 33 /* Bridge tower */ -#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, (p)->sct_uid, (p)) #define getsectp(x, y) ((struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y)))) #define getsectid(id) ((struct sctstr *)ef_ptr(EF_SECTOR, (id))) -extern struct dchrstr dchr[SCT_TYPE_MAX + 2]; +#define DCHR_SZ 40 +extern struct dchrstr dchr[DCHR_SZ]; + #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG) /* Minimal efficiency of sectors that can be knocked down (bridges) */ @@ -223,7 +223,8 @@ struct sctintrins { unsigned char in_enable; /* enabled iff non-zero */ }; -extern struct sctintrins intrchr[INT_DEF + 2]; +#define INTRCHR_SZ INT_DEF + 2 +extern struct sctintrins intrchr[INTRCHR_SZ]; extern int fort_fire(struct sctstr *); extern int sct_rail_track(struct sctstr *);