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

subs: Rename shp_nav(), lnd_mar()

Browse source 
... to shp_nav_stay_behind(), lnd_mar_stay_behind(), to better reflect
their purpose.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-05 17:44:26 +01:00
parent 24000b4855
commit 74a71aa007
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/land.h
View file

@ -193,7 +193,7 @@ extern void lnd_submil(struct lndstr *, int);
extern void lnd_takemob(struct emp_qelem *, double); extern void lnd_takemob(struct emp_qelem *, double);
extern int lnd_spyval(struct lndstr *); extern int lnd_spyval(struct lndstr *);
extern void intelligence_report(int, struct lndstr *, int, char *); extern void intelligence_report(int, struct lndstr *, int, char *);
extern void lnd_mar(struct emp_qelem *, natid); extern void lnd_mar_stay_behind(struct emp_qelem *, natid);
extern void lnd_put(struct emp_qelem *); extern void lnd_put(struct emp_qelem *);
extern void lnd_put_one(struct ulist *); extern void lnd_put_one(struct ulist *);
extern int lnd_hardtarget(struct lndstr *); extern int lnd_hardtarget(struct lndstr *);

2
include/ship.h
View file

@ -172,7 +172,7 @@ extern double shp_torp_hitchance(struct shpstr *, int);
extern int shp_may_nav(struct shpstr *, struct shpstr *, char *); extern int shp_may_nav(struct shpstr *, struct shpstr *, char *);
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 *, natid); extern void shp_nav_stay_behind(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 shp_stuck shp_check_nav(struct shpstr *, struct sctstr *); extern enum shp_stuck shp_check_nav(struct shpstr *, struct sctstr *);
extern int sect_has_dock(struct sctstr *); extern int sect_has_dock(struct sctstr *);

2
src/lib/subs/lndsub.c
View file

@ -528,7 +528,7 @@ lnd_insque(struct lndstr *lp, struct emp_qelem *list)
} }
void void
lnd_mar(struct emp_qelem *list, natid actor) lnd_mar_stay_behind(struct emp_qelem *list, natid actor)
{ {
struct emp_qelem *qp; struct emp_qelem *qp;
struct emp_qelem *next; struct emp_qelem *next;

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

@ -161,7 +161,7 @@ shp_insque(struct shpstr *sp, struct emp_qelem *list)
} }
void void
shp_nav(struct emp_qelem *list, natid actor) shp_nav_stay_behind(struct emp_qelem *list, natid actor)
{ {
struct emp_qelem *qp; struct emp_qelem *qp;
struct emp_qelem *next; struct emp_qelem *next;

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

@ -441,9 +441,9 @@ unit_move(struct emp_qelem *list)
} }
if (type == EF_SHIP) if (type == EF_SHIP)
shp_nav(list, player->cnum); shp_nav_stay_behind(list, player->cnum);
else else
lnd_mar(list, player->cnum); lnd_mar_stay_behind(list, player->cnum);
if (QEMPTY(list)) { if (QEMPTY(list)) {
pr("No %s left\n", type == EF_SHIP ? "ships" : "lands"); pr("No %s left\n", type == EF_SHIP ? "ships" : "lands");