From ce7ab95c3bb677b8fbc13b08b623825f92919783 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 24 Mar 2008 08:04:10 +0100 Subject: [PATCH] Check plane efficiency and capabilities earlier in pln_sel() This way we don't complain about range to assembly point and destination for planes that can't go regardless. --- src/lib/subs/plnsub.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index dc6a116d7..24b01006d 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -504,6 +504,13 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap, continue; if (plane.pln_mobil <= 0) continue; + if (plane.pln_effic < 40) { + pr("%s not efficient enough (must be 40%%)\n", + prplane(&plane)); + continue; + } + if (!pln_capable(&plane, wantflags, nowantflags)) + continue; if (opt_MARKET) { if (ontradingblock(EF_PLANE, &plane)) { pr("plane #%d inelligible - it's for sale.\n", @@ -517,16 +524,9 @@ pln_sel(struct nstr_item *ni, struct emp_qelem *list, struct sctstr *ap, pr("%s too far from assembly point\n", prplane(&plane)); continue; } - if (plane.pln_effic < 40) { - pr("%s not efficient enough (must be 40%%)\n", - prplane(&plane)); - continue; - } range += ap_to_target; range *= rangemult; pcp = &plchr[(int)plane.pln_type]; - if (!pln_capable(&plane, wantflags, nowantflags)) - continue; if (plane.pln_range < range) { pr("%s out of range (%d:%d)\n", prplane(&plane), plane.pln_range, range); -- 2.43.0