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

(unit_path): New, create by combining shp_path() and lnd_path().

Browse source 
(do_unit_move): Replace shp_path() and lnd_path() with unit_path().
(shp_path, lnd_path): Remove shp_path() and lnd_path(),
not used any more.
This commit is contained in:
Ron Koenderink 2007-01-24 23:24:37 +00:00
parent d94d269769
commit aee2bc78e2
7 changed files with 55 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,13 +94,8 @@ do_unit_move(struct emp_qelem *ulist, int *together,
if (player->argp[2]) {
strcpy(buf, player->argp[2]);
if (type == EF_SHIP) {
if (!(cp = shp_path(*together, (struct shpstr *)leader, buf)))
cp = player->argp[2];
} else {
if (!(cp = lnd_path(*together, (struct lndstr *)leader, buf)))
cp = player->argp[2];
}
if (!(cp = unit_path(*together, leader, buf)))
cp = player->argp[2];
}
*pt = '\0';
@ -161,15 +156,8 @@ do_unit_move(struct emp_qelem *ulist, int *together,
stopping = 1;
continue;
}
if (type == EF_SHIP) {
if (!(cp = shp_path(*together, (struct shpstr *)leader,
buf)))
cp = buf;
} else {
if (!(cp = lnd_path(*together, (struct lndstr *)leader,
buf)))
cp = buf;
}
if (!(cp = unit_path(*together, leader, buf)))
cp = buf;
}
if (type == EF_SHIP) {
radmapnopr(leader->x, leader->y, (int)leader->effic,