subs: Rename shp_nav(), lnd_mar()

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

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/land.h b/include/land.h
index cf26f82fe663a6c5d78d9bf126e58393b73fbcf9..74d59514ca2bd1ecb30656e04da3448ebb112e8f 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -193,7 +193,7 @@ extern void lnd_submil(struct lndstr *, int);
 extern void lnd_takemob(struct emp_qelem *, double);
 extern int lnd_spyval(struct lndstr *);
 extern void intelligence_report(int, struct lndstr *, int, char *);
 extern void lnd_takemob(struct emp_qelem *, double);
 extern int lnd_spyval(struct lndstr *);
 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_one(struct ulist *);
 extern int lnd_hardtarget(struct lndstr *);
 extern void lnd_put(struct emp_qelem *);
 extern void lnd_put_one(struct ulist *);
 extern int lnd_hardtarget(struct lndstr *);

diff --git a/include/ship.h b/include/ship.h
index 90427b49412e267d90a67473de5cdfe6c6685d71..ed005af1f210748646f33ec376a5c35348f6202d 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -172,7 +172,7 @@ extern double shp_torp_hitchance(struct shpstr *, int);
 extern int shp_may_nav(struct shpstr *, struct shpstr *, char *);
 extern void shp_sel(struct nstr_item *, struct emp_qelem *);
 extern struct ulist *shp_insque(struct shpstr *, struct emp_qelem *);
 extern int shp_may_nav(struct shpstr *, struct shpstr *, char *);
 extern void shp_sel(struct nstr_item *, 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 enum shp_stuck shp_check_nav(struct shpstr *, struct sctstr *);
 extern int sect_has_dock(struct sctstr *);
 extern int shp_sweep(struct emp_qelem *, int, int, natid);
 extern enum shp_stuck shp_check_nav(struct shpstr *, struct sctstr *);
 extern int sect_has_dock(struct sctstr *);

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 7d57dc718f75873897b0886d6435913a53323d3c..2f344594003607d5c62192ae236a67a595f2f704 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -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 *next;
 {
     struct emp_qelem *qp;
     struct emp_qelem *next;

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index e8f39137eda8c1ea733b9a814b315860401a61d5..ea13e57d34e7d21f646ffde265450596c2ef3639 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -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 *next;
 {
     struct emp_qelem *qp;
     struct emp_qelem *next;

diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c
index baa5974ae78b68452af72e49762ec798faa81e4c..e0e6a07065980129f59c9b84a51460f5fc0c1231 100644 (file)
--- a/src/lib/subs/unitsub.c
+++ b/src/lib/subs/unitsub.c
@@ -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)) {
            pr("No %s left\n", type == EF_SHIP ? "ships" : "lands");
 
        if (QEMPTY(list)) {
            pr("No %s left\n", type == EF_SHIP ? "ships" : "lands");