From 65e934a083080b237cd88034a77540d736c9391c Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 22 Mar 2008 18:25:39 +0100
Subject: [PATCH] Make pupgr() reject planes in orbit early

It's best to check and report conditions the player can't change
before those he could.
---
 src/lib/commands/upgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c
index a47b28de..119fb912 100644
--- 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;