New get_planes(), factored out of plane flying commands

[empserver] / src / lib / commands / fly.c

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 97304f7dc3a639636f0ff0d79351dc877bf0f93b..b0095b76280956ce294490ef5d2ba5fe1c7e148a 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -60,11 +60,8 @@ fly(void)
     char buf[1024];
 
     wantflags = 0;
-    if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
+    if (get_planes(&ni_bomb, &ni_esc, player->argp[1], player->argp[2]) < 0)
        return RET_SYN;
-    if (!snxtitem(&ni_esc, EF_PLANE,
-                 getstarg(player->argp[2], "escort(s)? ", buf)))
-       pr("No escorts...\n");
     if (!get_assembly_point(player->argp[3], &ap_sect, buf))
        return RET_SYN;
     ax = ap_sect.sct_x;