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

Factor inc_shp_nplane() out of could_be_on_ship()

Browse source
This commit is contained in:
Markus Armbruster 2012-06-23 16:28:59 +02:00
parent ae279968b9
commit 81efebd367
1 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -836,6 +836,29 @@ ship_can_carry(struct shpstr *sp, int n, int nch, int nxl, int nmsl)
return nfw + nmsl <= mcp->m_nplanes; return nfw + nmsl <= mcp->m_nplanes;
} }
/*
* Increment carrier plane counters for PP.
* If it's a chopper, increment *NCH.
* Else, if it's x-light, increment *NXL.
* Else, if it's a light missile, increment *MSL.
* Return non-zero if it's a chopper, x-light or light.
*/
static int
inc_shp_nplane(struct plnstr *pp, int *nch, int *nxl, int *nmsl)
{
struct plchrstr *pcp = &plchr[pp->pln_type];
if (pcp->pl_flags & P_K)
(*nch)++;
else if (pcp->pl_flags & P_E)
(*nxl)++;
else if (!(pcp->pl_flags & P_L))
return 0;
else if (pcp->pl_flags & P_M)
(*nmsl)++;
return 1;
}
/* /*
* Can PP be loaded on a ship of SP's type? * Can PP be loaded on a ship of SP's type?
* Assume that it already carries N planes, of which NCH are choppers, * Assume that it already carries N planes, of which NCH are choppers,
@ -846,16 +869,8 @@ int
could_be_on_ship(struct plnstr *pp, struct shpstr *sp, could_be_on_ship(struct plnstr *pp, struct shpstr *sp,
int n, int nch, int nxl, int nmsl) int n, int nch, int nxl, int nmsl)
{ {
struct plchrstr *pcp = &plchr[pp->pln_type]; if (!inc_shp_nplane(pp, &nch, &nxl, &nmsl))
if (pcp->pl_flags & P_K)
nch++;
else if (pcp->pl_flags & P_E)
nxl++;
else if (!(pcp->pl_flags & P_L))
return 0; return 0;
else if (pcp->pl_flags & P_M)
nmsl++;
return ship_can_carry(sp, n + 1, nch, nxl, nmsl); return ship_can_carry(sp, n + 1, nch, nxl, nmsl);
} }