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

subs: Rename shp_put() to shp_nav_put()

Browse source 
For consistency with lnd_mar_put().

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-25 16:05:07 +01:00
parent 18bf9e0b34
commit 7548337e73
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ship.h
View file

@ -185,7 +185,7 @@ extern double shp_torp_hitchance(struct shpstr *, int);
extern void shp_sel(struct nstr_item *, struct emp_qelem *); extern void shp_sel(struct nstr_item *, struct emp_qelem *);
extern struct ulist *shp_insque(struct shpstr *, struct emp_qelem *); extern struct ulist *shp_insque(struct shpstr *, struct emp_qelem *);
extern void shp_nav(struct emp_qelem *, double *, double *, int *, natid); extern void shp_nav(struct emp_qelem *, double *, double *, int *, natid);
extern void shp_put(struct emp_qelem *, natid); extern void shp_nav_put(struct emp_qelem *, natid);
extern int shp_sweep(struct emp_qelem *, int, int, natid); extern int shp_sweep(struct emp_qelem *, int, int, natid);
extern enum d_navigation shp_check_nav(struct shpstr *, struct sctstr *); extern enum d_navigation shp_check_nav(struct shpstr *, struct sctstr *);
extern int sect_has_dock(struct sctstr *); extern int sect_has_dock(struct sctstr *);

4
src/lib/subs/shpsub.c
View file

@ -181,7 +181,7 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
} }
void void
shp_put(struct emp_qelem *list, natid actor) shp_nav_put(struct emp_qelem *list, natid actor)
{ {
struct emp_qelem *qp, *next; struct emp_qelem *qp, *next;
struct ulist *mlp; struct ulist *mlp;
@ -779,7 +779,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
int navigate; int navigate;
if (dir <= DIR_STOP || dir >= DIR_VIEW) { if (dir <= DIR_STOP || dir >= DIR_VIEW) {
shp_put(list, actor); shp_nav_put(list, actor);
return 1; return 1;
} }
dx = diroff[dir][0]; dx = diroff[dir][0];

2
src/lib/update/sail.c
View file

@ -270,7 +270,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
fltp->maxmoves = 1; fltp->maxmoves = 1;
--fltp->maxmoves; --fltp->maxmoves;
} }
shp_put(&ship_list, own); shp_nav_put(&ship_list, own);
getship(sp->shp_uid, &ship); getship(sp->shp_uid, &ship);
fltp->x = ship.shp_x; fltp->x = ship.shp_x;
fltp->y = ship.shp_y; fltp->y = ship.shp_y;