]> git.pond.sub.org Git - empserver/commitdiff
plnsub: Let crewless planes spread the plague, too
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 28 May 2016 17:21:12 +0000 (19:21 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 6 Aug 2017 17:59:56 +0000 (19:59 +0200)
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 <armbru@pond.sub.org>
src/lib/subs/plnsub.c

index f8eeaa613775fd93837324dc2f144af5537c8d4c..ea87d2a3b138ef2686cdd26b482a3748e01bdc53 100644 (file)
@@ -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;