From ca9af92523daac3b5febd23111b2085548747723 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 14 Dec 2008 13:40:32 -0500 Subject: [PATCH] Check capabilities required for mission before range Checking range first could complain about range when the mission couldn't work regardless of range. Not helpful. --- src/lib/commands/miss.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index acd24b4e..c8110e16 100644 --- a/src/lib/commands/miss.c +++ b/src/lib/commands/miss.c @@ -188,20 +188,6 @@ mission(void) obj_nameof(gp)); continue; } - if (*p == '.') { - x = gp->x; - y = gp->y; - } - - radius = oprange(gp, mission); - if (radius < mapdist(gp->x, gp->y, x, y)) { - pr("%s: out of range! (range %d)\n", - obj_nameof(gp), radius); - continue; - } - - if (radius > desired_radius) - radius = desired_radius; if ((mission == MI_INTERDICT) && (type == EF_SHIP)) if (mchr[(int)gp->type].m_glim == 0) { @@ -264,6 +250,20 @@ mission(void) } } + if (*p == '.') { + x = gp->x; + y = gp->y; + } + + radius = oprange(gp, mission); + if (radius < mapdist(gp->x, gp->y, x, y)) { + pr("%s: out of range! (range %d)\n", + obj_nameof(gp), radius); + continue; + } + + if (radius > desired_radius) + radius = desired_radius; num++; /* good one.. go with it */ pr("%s on %s mission, centered on %s, radius %d\n",