From e8b0e14d3db6aaacbabbec2a1df025b91eeeec93 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 28 May 2016 19:21:12 +0200 Subject: [PATCH] plnsub: Let crewless planes spread the plague, too Commit 612ec62 (v4.3.31) made plane crew and cargo spread the plague. This requires looking for crew in build materials. Awkward if we ever permit non-military crew. Simply drop the "has crew" condition. If a plane's cargo can spread it, then servicing and refueling the plane can spread it, too. Signed-off-by: Markus Armbruster --- src/lib/subs/plnsub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index f8eeaa61..ea87d2a3 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -239,7 +239,7 @@ pln_newlanding(struct emp_qelem *list, coord tx, coord ty, int cno) cname(player->cnum), prplane(&plp->plane), prship(&ship)); } - if (plp->pcp->pl_mat[I_MILIT] && plp->pstage == PLG_INFECT + if (plp->pstage == PLG_INFECT && ship.shp_pstage == PLG_HEALTHY) ship.shp_pstage = PLG_EXPOSED; } @@ -253,7 +253,7 @@ pln_newlanding(struct emp_qelem *list, coord tx, coord ty, int cno) cname(player->cnum), prplane(&plp->plane), xyas(tx, ty, sect.sct_own)); } - if (plp->pcp->pl_mat[I_MILIT] && plp->pstage == PLG_INFECT + if (plp->pstage == PLG_INFECT && sect.sct_pstage == PLG_HEALTHY) sect.sct_pstage = PLG_EXPOSED; plp->plane.pln_ship = cno;