Check plane efficiency and capabilities earlier in pln_sel()

[empserver] / src / lib / subs / plnsub.c

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index dc6a116d7fbcc5712c64fc30ba51399b91026c89..24b01006d52058b136370ca6e525e3d25b6868dd 100644 (file)
--- 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);