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

Change pln_dropoff() parameters to match pln_newlanding()

Browse source 
This moves getting the target sector or ship from caller into
pln_dropoff().  Makes sense, because that's where it's put.
This commit is contained in:
Markus Armbruster 2008-07-12 14:35:41 -04:00
parent 42d9475d89
commit 27edba1f1b
4 changed files with 29 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,7 @@ drop(void)
if (wantflags & P_MINE)
pln_mine(&bomb_list, &target);
else
pln_dropoff(&bomb_list, ip, tx, ty, &target, EF_SECTOR);
pln_dropoff(&bomb_list, ip, tx, ty, -1);
}
pln_put(&bomb_list);
pln_put(&esc_list);

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

@ -49,7 +49,6 @@ fly(void)
int ap_to_target;
struct ichrstr *ip;
char flightpath[MAX_PATH_LEN];
struct shpstr ship;
int cno;
struct nstr_item ni_bomb;
struct nstr_item ni_esc;
@ -58,8 +57,6 @@ fly(void)
struct emp_qelem esc_list;
int wantflags;
struct sctstr ap_sect;
int dst_type;
void *dst_ptr;
char buf[1024];
wantflags = 0;
@ -133,16 +130,7 @@ fly(void)
if (QEMPTY(&bomb_list)) {
pr("No planes got through fighter defenses\n");
} else {
getsect(tx, ty, &target);
if (cno < 0) {
dst_ptr = &target;
dst_type = EF_SECTOR;
} else {
getship(cno, &ship);
dst_ptr = &ship;
dst_type = EF_SHIP;
}
pln_dropoff(&bomb_list, ip, tx, ty, dst_ptr, dst_type);
pln_dropoff(&bomb_list, ip, tx, ty, cno);
pln_newlanding(&bomb_list, tx, ty, cno);
pln_newlanding(&esc_list, tx, ty, cno);
}