empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New get_planes(), factored out of plane flying commands

Browse source 
No functional change.
This commit is contained in:
Markus Armbruster 2008-07-26 14:58:44 -04:00
parent 3eb58312b3
commit d3f644a37f
7 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -535,6 +535,8 @@ extern int pln_postread(int, void *);
extern int pln_prewrite(int, void *);
/* plnsub.c */
extern void count_planes(struct shpstr *);
extern int get_planes(struct nstr_item *, struct nstr_item *,
char *, char *);
extern struct sctstr *get_assembly_point(char *, struct sctstr *, char *);
extern int pln_onewaymission(struct sctstr *, int *, int *);
extern int pln_oneway_to_carrier_ok(struct emp_qelem *,

5
src/lib/commands/bomb.c
View file

@ -99,11 +99,8 @@ bomb(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");
p = getstarg(player->argp[3], "pinpoint, or strategic? ", buf);
if (!p || !*p)
return RET_SYN;

5
src/lib/commands/drop.c
View file

@ -58,11 +58,8 @@ drop(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;

5
src/lib/commands/fly.c
View file

@ -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;

5
src/lib/commands/para.c
View file

@ -63,11 +63,8 @@ para(void)
char buf[1024];
wantflags = P_P;
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;

5
src/lib/commands/reco.c
View file

@ -57,11 +57,8 @@ reco(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;

23
src/lib/subs/plnsub.c
View file

@ -57,6 +57,29 @@
static int pln_equip(struct plist *, struct ichrstr *, int, char);
static int fit_plane_on_ship(struct plnstr *, struct shpstr *);
/*
* Get planes and escorts argument.
* Read planes into *NI_BOMB, and (optional) escorts into *NI_ESC.
* If INPUT_BOMB is not empty, use it, else prompt for more input.
* Same for INPUT_ESC.
* If we got a plane argument, initialize *NI_BOMB and *NI_ESC, and
* return 0.
* Else return -1 (*NI_BOMB and *NI_ESC may be modified).
*/
int
get_planes(struct nstr_item *ni_bomb, struct nstr_item *ni_esc,
char *input_bomb, char *input_esc)
{
char buf[1024];
if (!snxtitem(ni_bomb, EF_PLANE, input_bomb))
return -1;
if (!snxtitem(ni_esc, EF_PLANE,
getstarg(input_esc, "escort(s)? ", buf)))
pr("No escorts...\n");
return 0;
}
/*
* Get assembly point argument.
* If INPUT is not empty, use it, else prompt for more input using PROMPT.