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

(fit_plane_on_ship, fit_plane_off_ship): Don't require M_CHOPPER for

Browse source 
use of chopper slot.  Same for M_XLIGHT and x-light slot.  No
functional change, because presence of slots implies the flags (see
init_mchr()).
This commit is contained in:
Markus Armbruster 2007-11-01 07:25:21 +00:00
parent 9c98b7b14b
commit 55df03f4ff
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -807,12 +807,10 @@ fit_plane_on_ship(struct plnstr *pp, struct shpstr *sp)
struct plchrstr *pcp = plchr + pp->pln_type; struct plchrstr *pcp = plchr + pp->pln_type;
struct mchrstr *mcp = mchr + sp->shp_type; struct mchrstr *mcp = mchr + sp->shp_type;
if ((pcp->pl_flags & P_K) && (mcp->m_flags & M_CHOPPER) if ((pcp->pl_flags & P_K) && sp->shp_nchoppers < mcp->m_nchoppers)
&& sp->shp_nchoppers < mcp->m_nchoppers)
return ++sp->shp_nchoppers; return ++sp->shp_nchoppers;
if ((pcp->pl_flags & P_E) && (mcp->m_flags & M_XLIGHT) if ((pcp->pl_flags & P_E) && sp->shp_nxlight < mcp->m_nxlight)
&& sp->shp_nxlight < mcp->m_nxlight)
return ++sp->shp_nxlight; return ++sp->shp_nxlight;
if (!(pcp->pl_flags & P_L)) if (!(pcp->pl_flags & P_L))
@ -840,16 +838,13 @@ fit_plane_off_ship(struct plnstr *pp, struct shpstr *sp)
* run count_planes() before fit_plane_on_ship(). * run count_planes() before fit_plane_on_ship().
*/ */
struct plchrstr *pcp = plchr + pp->pln_type; struct plchrstr *pcp = plchr + pp->pln_type;
struct mchrstr *mcp = mchr + sp->shp_type;
if ((pcp->pl_flags & P_K) && (mcp->m_flags & M_CHOPPER) if ((pcp->pl_flags & P_K) && sp->shp_nchoppers) {
&& sp->shp_nchoppers) {
sp->shp_nchoppers--; sp->shp_nchoppers--;
return; return;
} }
if ((pcp->pl_flags & P_E) && (mcp->m_flags & M_XLIGHT) if ((pcp->pl_flags & P_E) && sp->shp_nxlight) {
&& sp->shp_nxlight) {
sp->shp_nxlight--; sp->shp_nxlight--;
return; return;
} }
@ -901,7 +896,7 @@ fit_plane_on_land(struct plnstr *pp, struct lndstr *lp)
struct plchrstr *pcp = plchr + pp->pln_type; struct plchrstr *pcp = plchr + pp->pln_type;
struct lchrstr *lcp = lchr + lp->lnd_type; struct lchrstr *lcp = lchr + lp->lnd_type;
if ((pcp->pl_flags & P_E) && (lp->lnd_nxlight < lcp->l_nxlight)) if ((pcp->pl_flags & P_E) && lp->lnd_nxlight < lcp->l_nxlight)
return ++lp->lnd_nxlight; return ++lp->lnd_nxlight;
return 0; return 0;