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

(SHP_AIROPS_EFF, LND_AIROPS_EFF): New. Use it instead of literal 50.

Browse source
This commit is contained in:
Markus Armbruster 2004-08-17 18:31:32 +00:00
parent 90a61e245f
commit 4fd7da248a
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/land.h
View file

@ -194,6 +194,10 @@ struct llist {
int supplied; int supplied;
}; };
enum {
LND_AIROPS_EFF = 50 /* min. efficiency for air ops */
};
/* src/lib/subs/lndsub.c */ /* src/lib/subs/lndsub.c */
extern void lnd_sweep(struct emp_qelem *, int, int, natid); extern void lnd_sweep(struct emp_qelem *, int, int, natid);
extern int lnd_interdict(struct emp_qelem *, coord, coord, natid); extern int lnd_interdict(struct emp_qelem *, coord, coord, natid);

1
include/ship.h
View file

@ -214,6 +214,7 @@ struct mlist {
#define CN_ERROR (-1) #define CN_ERROR (-1)
enum { enum {
SHP_AIROPS_EFF = 50, /* min. efficiency for air ops */
M_TORP_SHELLS = 3 /* number of shells used by a torpedo */ M_TORP_SHELLS = 3 /* number of shells used by a torpedo */
}; };

8
src/lib/subs/mission.c
View file

@ -1115,8 +1115,8 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
if (ship.shp_effic < SHIP_MINEFF) { if (ship.shp_effic < SHIP_MINEFF) {
goto shipsunk; goto shipsunk;
} }
/* Can't fly off of ships < 50%, or non-owned or non-allied ships */ /* Can't fly off of inefficient or non-owned, non-allied ships */
if ((ship.shp_effic < 50) || if ((ship.shp_effic < SHP_AIROPS_EFF) ||
((ship.shp_own != pp->pln_own) && ((ship.shp_own != pp->pln_own) &&
(getrel(getnatp(ship.shp_own), pp->pln_own) != ALLIED))) { (getrel(getnatp(ship.shp_own), pp->pln_own) != ALLIED))) {
emp_remque(qp); emp_remque(qp);
@ -1138,8 +1138,8 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags,
if (land.lnd_effic < LAND_MINEFF) if (land.lnd_effic < LAND_MINEFF)
goto landdead; goto landdead;
/* Can't fly off of units < 50%, or non-owned or non-allied units */ /* Can't fly off of inefficient or non-owned, non-allied units */
if ((land.lnd_effic < 50) || if ((land.lnd_effic < LND_AIROPS_EFF) ||
((land.lnd_own != pp->pln_own) && ((land.lnd_own != pp->pln_own) &&
(getrel(getnatp(land.lnd_own), pp->pln_own) != ALLIED))) { (getrel(getnatp(land.lnd_own), pp->pln_own) != ALLIED))) {
emp_remque(qp); emp_remque(qp);

4
src/lib/subs/plnsub.c
View file

@ -466,7 +466,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
goto shipsunk; goto shipsunk;
if (ship.shp_effic < SHIP_MINEFF) if (ship.shp_effic < SHIP_MINEFF)
goto shipsunk; goto shipsunk;
if (ship.shp_effic < 50) if (ship.shp_effic < SHP_AIROPS_EFF)
continue; continue;
/* Can't fly off non-owned ships or non-allied ship */ /* Can't fly off non-owned ships or non-allied ship */
if ((ship.shp_own != player->cnum) && if ((ship.shp_own != player->cnum) &&
@ -489,7 +489,7 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap,
goto landdead; goto landdead;
if (land.lnd_effic < LAND_MINEFF) if (land.lnd_effic < LAND_MINEFF)
goto landdead; goto landdead;
if (land.lnd_effic < 50) if (land.lnd_effic < LND_AIROPS_EFF)
continue; continue;
/* Can't fly off units in ships or other units */ /* Can't fly off units in ships or other units */
if ((land.lnd_ship >= 0) || (land.lnd_land >= 0)) if ((land.lnd_ship >= 0) || (land.lnd_land >= 0))