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

Inline fit_plane_on_ship() and fit_plane_on_land()

Browse source 
Just one call site each.
This commit is contained in:
Markus Armbruster 2012-06-23 16:46:11 +02:00
parent b60e5be22c
commit 665d0d723d
1 changed files with 7 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -879,27 +879,16 @@ could_be_on_ship(struct plnstr *pp, struct shpstr *sp,
return ship_can_carry(sp, n + 1, nch, nxl, nmsl); return ship_can_carry(sp, n + 1, nch, nxl, nmsl);
} }
/*
* Fit a plane of PP's type on ship SP.
* Updating the plane accordingly is the caller's job.
* Return whether it fits.
*/
static int
fit_plane_on_ship(struct plnstr *pp, struct shpstr *sp)
{
int n, nch, nxl, nmsl;
n = shp_nplane(sp, &nch, &nxl, &nmsl);
return could_be_on_ship(pp, sp, n, nch, nxl, nmsl);
}
int int
put_plane_on_ship(struct plnstr *plane, struct shpstr *ship) put_plane_on_ship(struct plnstr *plane, struct shpstr *ship)
{ {
int n, nch, nxl, nmsl;
if (plane->pln_ship == ship->shp_uid) if (plane->pln_ship == ship->shp_uid)
return 1; /* Already on ship */ return 1; /* Already on ship */
if (!fit_plane_on_ship(plane, ship)) n = shp_nplane(ship, &nch, &nxl, &nmsl);
if (!could_be_on_ship(plane, ship, n, nch, nxl, nmsl))
return 0; return 0;
plane->pln_x = ship->shp_x; plane->pln_x = ship->shp_x;
@ -909,27 +898,14 @@ put_plane_on_ship(struct plnstr *plane, struct shpstr *ship)
return 1; return 1;
} }
/*
* Fit a plane of PP's type on land unit LP.
* Updating the plane accordingly is the caller's job.
* Return whether it fits.
*/
static int
fit_plane_on_land(struct plnstr *pp, struct lndstr *lp)
{
struct plchrstr *pcp = plchr + pp->pln_type;
struct lchrstr *lcp = lchr + lp->lnd_type;
return (pcp->pl_flags & P_E) && lnd_nxlight(lp) < lcp->l_nxlight;
}
int int
put_plane_on_land(struct plnstr *plane, struct lndstr *land) put_plane_on_land(struct plnstr *plane, struct lndstr *land)
{ {
if (plane->pln_land == land->lnd_uid) if (plane->pln_land == land->lnd_uid)
return 1; /* Already on unit */ return 1; /* Already on unit */
if (!(plchr[plane->pln_type].pl_flags & P_E))
if (!fit_plane_on_land(plane, land)) return 0;
if (lnd_nxlight(land) >= lchr[land->lnd_type].l_nxlight)
return 0; return 0;
plane->pln_x = land->lnd_x; plane->pln_x = land->lnd_x;