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

Fix insufficiently parenthesized macro expansions.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-30 16:08:45 +00:00
parent cee8e126a2
commit a292d6f98a
16 changed files with 43 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/sect.h
View file

@ -155,21 +155,17 @@ struct dchrstr {
#define SCT_EFFIC 34 /* used in update & budget */
#define SCT_MAXDEF 34 /* highest sector type in header files */
#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 getsectp(x, y) \
(struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y)))
#define getsectid(id) \
(struct sctstr *)ef_ptr(EF_SECTOR, id)
#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 getsectp(x, y) (struct sctstr *)ef_ptr(EF_SECTOR, sctoff((x), (y)))
#define getsectid(id) (struct sctstr *)ef_ptr(EF_SECTOR, (id))
/* things relating to sectors */
extern int sctoff(coord x, coord y);
extern struct dchrstr dchr[SCT_MAXDEF + 1];
extern struct dchrstr bigcity_dchr;
#define IS_BIG_CITY(sect) (dchr[sect].d_pkg == UPKG)
#define IS_BIG_CITY(sect) (dchr[(sect)].d_pkg == UPKG)
/* Minimal efficiency of sectors that can be knocked down (bridges) */
#define SCT_MINEFF 20