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

6
include/ship.h
View file

@ -31,7 +31,7 @@
* Thomas Ruschak, 1992
* Ken Stevens, 1995
* Steve McClure, 1998
* Markus Armbruster, 2004-2016
* Markus Armbruster, 2004-2020
*/
#ifndef SHIP_H
@ -42,7 +42,6 @@
#include "retreat.h"
#include "types.h"
#define SHP_TYPE_MAX 46
#define SHIP_MINEFF 20
#define MAXSHPNAMLEN 24
@ -127,7 +126,8 @@ struct mchrstr {
#define putship(n, p) ef_write(EF_SHIP, (n), (p))
#define getshipp(n) ((struct shpstr *)ef_ptr(EF_SHIP, (n)))
extern struct mchrstr mchr[SHP_TYPE_MAX + 2];
#define MCHR_SZ 48
extern struct mchrstr mchr[MCHR_SZ];
enum {
SHP_AIROPS_EFF = 50, /* min. efficiency for air ops */