Make pupgr() reject planes in orbit early

It's best to check and report conditions the player can't change
before those he could.

diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index a47b28dee5368aa5fe7e1a863fd6dcf52b9cd658..119fb912b74fd494dba6553a42493fa26212e113 100644 (file)
--- a/src/lib/commands/upgr.c
+++ b/src/lib/commands/upgr.c
@@ -272,6 +272,10 @@ pupgr(void)
               plane.pln_uid);
            continue;
        }
+       if (plane.pln_flags & PLN_LAUNCHED) {
+           pr("Plane %s is in orbit!\n", prplane(&plane));
+           continue;
+       }
        n++;
        pp = &plchr[(int)plane.pln_type];
        avail = (PLN_BLD_WORK(pp->pl_lcm, pp->pl_hcm) * UPGR_COST + 99) / 100;
@@ -296,10 +300,6 @@ pupgr(void)
               prplane(&plane));
            continue;
        }
-       if (plane.pln_flags & PLN_LAUNCHED) {
-           pr("Plane %s is in orbit!\n", prplane(&plane));
-           continue;
-       }
 
        sect.sct_avail -= avail;
        plane.pln_effic -= UPGR_EFF;