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

navigate march: Drop do_unit_move() parameter together

Browse source 
It's always non-zero now.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-12-28 22:32:23 +01:00
parent a024dbb8a3
commit 6502ac2a8f
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/lib/commands/marc.c
View file

@ -44,7 +44,6 @@ march(void)
struct nstr_item ni_land;
struct emp_qelem land_list;
double minmob, maxmob;
int together = 1;
if (!snxtitem(&ni_land, EF_LAND, player->argp[1], NULL))
return RET_SYN;
@ -54,5 +53,5 @@ march(void)
pr("No lands\n");
return RET_FAIL;
}
return do_unit_move(&land_list, &together, &minmob, &maxmob);
return do_unit_move(&land_list, &minmob, &maxmob);
}

10
src/lib/commands/navi.c
View file

@ -50,7 +50,6 @@ navi(void)
struct nstr_item ni_ship;
struct emp_qelem ship_list;
double minmob, maxmob;
int together = 1;
if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1], NULL))
return RET_SYN;
@ -60,12 +59,11 @@ navi(void)
pr("No ships\n");
return RET_FAIL;
}
return do_unit_move(&ship_list, &together, &minmob, &maxmob);
return do_unit_move(&ship_list, &minmob, &maxmob);
}
int
do_unit_move(struct emp_qelem *ulist, int *together,
double *minmob, double *maxmob)
do_unit_move(struct emp_qelem *ulist, double *minmob, double *maxmob)
{
char *cp = NULL;
int leader_uid;
@ -89,7 +87,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
if (player->argp[2]) {
strcpy(buf, player->argp[2]);
cp = unit_path(*together, leader, buf, sizeof(buf));
cp = unit_path(1, leader, buf, sizeof(buf));
}
while (!QEMPTY(ulist)) {
@ -140,7 +138,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
continue;
}
if (cp)
cp = unit_path(*together, leader, buf, sizeof(buf));
cp = unit_path(1, leader, buf, sizeof(buf));
}
if (type == EF_SHIP) {
rad_map_set(player->cnum, leader->x, leader->y, leader->effic,