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

(N_MAXSHIPS, SHP_TYPE_MAX, N_MAXPLANE, PLN_TYPE_MAX, N_MAXLAND)

Browse source 
(LND_TYPE_MAX): Replace.  Add a bit more space to the tables.
This commit is contained in:
Markus Armbruster 2006-06-22 20:10:23 +00:00
parent e81828ec4c
commit 063aabb893
6 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/land.h
View file

@ -42,7 +42,7 @@
#include "nsc.h" #include "nsc.h"
#include "retreat.h" #include "retreat.h"
#define N_MAXLAND 30 #define LND_TYPE_MAX 30
#define LAND_MINEFF 10 #define LAND_MINEFF 10
#define LAND_MINFIREEFF 40 /* arty must be this effic to fire */ #define LAND_MINFIREEFF 40 /* arty must be this effic to fire */
@ -178,7 +178,7 @@ struct lchrstr {
#define putland(n, p) ef_write(EF_LAND, (n), (p)) #define putland(n, p) ef_write(EF_LAND, (n), (p))
#define getlandp(n) (struct lndstr *)ef_ptr(EF_LAND, (n)) #define getlandp(n) (struct lndstr *)ef_ptr(EF_LAND, (n))
extern struct lchrstr lchr[N_MAXLAND + 1]; extern struct lchrstr lchr[LND_TYPE_MAX + 2];
struct llist { struct llist {
struct emp_qelem queue; /* list of units */ struct emp_qelem queue; /* list of units */

4
include/plane.h
View file

@ -39,7 +39,7 @@
#include "queue.h" #include "queue.h"
#include "sect.h" #include "sect.h"
#define N_MAXPLANE 40 #define PLN_TYPE_MAX 46
#define PLANE_MINEFF 10 #define PLANE_MINEFF 10
struct plnstr { struct plnstr {
@ -138,7 +138,7 @@ struct plist {
#define putplane(n, p) ef_write(EF_PLANE, (n), (p)) #define putplane(n, p) ef_write(EF_PLANE, (n), (p))
#define getplanep(n) (struct plnstr *)ef_ptr(EF_PLANE, (n)) #define getplanep(n) (struct plnstr *)ef_ptr(EF_PLANE, (n))
extern struct plchrstr plchr[N_MAXPLANE + 1]; extern struct plchrstr plchr[PLN_TYPE_MAX + 2];
struct shiplist { struct shiplist {
short uid; short uid;

4
include/ship.h
View file

@ -42,7 +42,7 @@
#include "misc.h" #include "misc.h"
#include "retreat.h" #include "retreat.h"
#define N_MAXSHIPS 40 #define SHP_TYPE_MAX 46
#define SHIP_MINEFF 20 #define SHIP_MINEFF 20
/* bit masks for the autonav mode flags */ /* bit masks for the autonav mode flags */
@ -183,7 +183,7 @@ struct mchrstr {
#define putship(n, p) ef_write(EF_SHIP, (n), (p)) #define putship(n, p) ef_write(EF_SHIP, (n), (p))
#define getshipp(n) (struct shpstr *)ef_ptr(EF_SHIP, (n)) #define getshipp(n) (struct shpstr *)ef_ptr(EF_SHIP, (n))
extern struct mchrstr mchr[N_MAXSHIPS + 1]; extern struct mchrstr mchr[SHP_TYPE_MAX + 2];
struct mlist { struct mlist {
struct emp_qelem queue; /* list of ships */ struct emp_qelem queue; /* list of ships */

3
src/lib/global/land.c
View file

@ -41,5 +41,6 @@
/* /*
* Table of land unit types * Table of land unit types
* Initialized on startup from land.config and deity custom config (if any). * Initialized on startup from land.config and deity custom config (if any).
* Terminated by a sentinel with null l_name.
*/ */
struct lchrstr lchr[N_MAXLAND + 1]; struct lchrstr lchr[LND_TYPE_MAX + 2];

3
src/lib/global/plane.c
View file

@ -43,5 +43,6 @@
/* /*
* Table of plane types * Table of plane types
* Initialized on startup from plane.config and deity custom config (if any). * Initialized on startup from plane.config and deity custom config (if any).
* Terminated by a sentinel with null pl_name.
*/ */
struct plchrstr plchr[N_MAXPLANE + 1]; struct plchrstr plchr[PLN_TYPE_MAX + 2];

3
src/lib/global/ship.c
View file

@ -43,5 +43,6 @@
/* /*
* Table of ship types * Table of ship types
* Initialized on startup from ship.config and deity custom config (if any). * Initialized on startup from ship.config and deity custom config (if any).
* Terminated by a sentinel with null m_name.
*/ */
struct mchrstr mchr[N_MAXSHIPS + 1]; struct mchrstr mchr[SHP_TYPE_MAX + 2];