From 9c98b7b14be2352487bf31cf2f3a27aa22822637 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 1 Nov 2007 06:35:50 +0000 Subject: [PATCH] (could_be_on_ship): Not consistent with fit_plane_on_ship(). Fix by using that. Less efficient, but that doesn't really matter here. --- src/lib/subs/plnsub.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index 1b74bd9d..83e1ef7c 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -952,31 +952,16 @@ take_plane_off_land(struct plnstr *plane, struct lndstr *land) } /* - * Could a plane of PP's type be on on a ship of SP's type? + * Could a plane of PP's type be on on ship SP? */ int could_be_on_ship(struct plnstr *pp, struct shpstr *sp) { - struct plchrstr *pcp = plchr + pp->pln_type; - struct mchrstr *mcp = mchr + sp->shp_type; + struct shpstr ship; - if (pcp->pl_flags & P_L) - if (mcp->m_flags & M_FLY) - return 1; - - if (pcp->pl_flags & P_K) - if (mcp->m_flags & M_CHOPPER) - return 1; - - if (pcp->pl_flags & P_M) - if (mcp->m_flags & M_MSL) - return 1; - - if (pcp->pl_flags & P_E) - if (mcp->m_flags & M_XLIGHT) - return 1; - - return 0; + ship = *sp; + sp->shp_nplane = sp->shp_nchoppers = sp->shp_nxlight = 0; + return fit_plane_on_ship(pp, &ship); } void