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

config: Slightly neater configuration table size macros

Browse source 
Macro SHP_TYPE_MAX is the largest possible ship type number.  It is
only used to size mchr[], and we need + 2 there.  Replace by MCHR_SZ
for simplicity.

Same for LND_TYPE_MAX, PLN_TYPE_MAX, P_MAX, and SCT_TYPE_MAX: replace
by LCHR_SZ, PLCHR_SZ, PCHR_SZ, and DCHR_SZ.

Same for N_MAXNUKE, except that one is more than the largest type
number.  Replace by NCHR_SZ.

For consistency, define ICHR_SZ and INTRCHR_SZ for sizing ichr[] and
intrchr_sz[].

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-12-26 06:30:24 +01:00
parent 6bad464348
commit e7583a519e
14 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/item.h
View file

@ -27,7 +27,7 @@
* item.h: Definitions for item characteristics stuff
*
* Known contributors to this file:
* Markus Armbruster, 2004-2016
* Markus Armbruster, 2004-2020
*/
#ifndef ITEM_H
@ -80,7 +80,8 @@ struct ichrstr {
/* variables using this structure */
extern struct ichrstr ichr[I_MAX + 2];
#define ICHR_SZ (I_MAX + 2)
extern struct ichrstr ichr[ICHR_SZ];
/* procedures using/returning this struct */