Fix get_planes() to abort at the escort prompt

This affects commands bomb, drop, fly, paradrop, recon and sweep.

The failure to abort was harmless, because all callers get additional
arguments, and abort then.

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index ae9afdfdacb53791b283c3584ead2205ba82358c..02cf81392d2002540ba3e3f50a0c2cc8db28c1c7 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -75,8 +75,11 @@ get_planes(struct nstr_item *ni_bomb, struct nstr_item *ni_esc,
     if (!snxtitem(ni_bomb, EF_PLANE, input_bomb))
        return -1;
     if (!snxtitem(ni_esc, EF_PLANE,
-                 getstarg(input_esc, "escort(s)? ", buf)))
+                 getstarg(input_esc, "escort(s)? ", buf))) {
+       if (player->aborted)
+           return -1;
        pr("No escorts...\n");
+    }
     return 0;
 }