empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(SCT_TYPE_MAX, dchr): Don't include dchr[]'s sentinel in SCT_TYPE_MAX.

Browse source 
(SCT_MAXDEF): Unused, remove.
This commit is contained in:
Markus Armbruster 2006-06-23 04:53:31 +00:00
parent 0e4eb6bf0a
commit 54bd2587d9
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/sect.h
View file

@ -151,9 +151,8 @@ struct dchrstr {
#define SCT_ENLIST 31 /* enlistment center */ #define SCT_ENLIST 31 /* enlistment center */
#define SCT_PLAINS 32 /* plains sector */ #define SCT_PLAINS 32 /* plains sector */
#define SCT_BTOWER 33 /* Bridge tower */ #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 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)) #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 */ /* things relating to sectors */
extern int sctoff(coord x, coord y); 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; extern struct dchrstr bigcity_dchr;
#define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG) #define IS_BIG_CITY(type) (dchr[(type)].d_pkg == UPKG)

2
src/lib/global/sect.c
View file

@ -45,7 +45,7 @@
* Initialized on startup from sect.config and deity custom config (if any). * Initialized on startup from sect.config and deity custom config (if any).
* Terminated by a sentinel with null d_name. * 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 * Table of infrastructure types