From bf9cb33fc23b821a3e8221e16bed53faa0405cea Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 11 May 2018 18:58:51 +0200 Subject: [PATCH] load: Move check for hardened plane into plane_loadable() This de-duplicates the check, and skips it when unloading. It never made sense there, and can't happen anymore since the previous commit. Signed-off-by: Markus Armbruster --- src/lib/commands/load.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index ba1fa8416..75e6c3612 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -380,6 +380,12 @@ plane_loadable(struct plnstr *pp, int noisy) prplane(pp), pp->pln_land); return 0; } + if (pp->pln_harden) { + if (noisy) + pr("%s has been hardened and can't be loaded\n", + prplane(pp)); + return 0; + } return 1; } @@ -463,12 +469,6 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy, } if (loading && !plane_loadable(&pln, noisy)) continue; - if (pln.pln_harden != 0) { - if (noisy) - pr("%s has been hardened and can't be loaded\n", - prplane(&pln)); - continue; - } if (!loading) { if (pln.pln_ship != sp->shp_uid) @@ -756,12 +756,6 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy, } if (loading && !plane_loadable(&pln, noisy)) continue; - if (pln.pln_harden != 0) { - if (noisy) - pr("%s has been hardened and can't be loaded\n", - prplane(&pln)); - continue; - } /* Plane sanity done */ /* Find the right unit */ -- 2.43.0