From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 5 Jan 2015 16:44:26 +0000 (+0100)
Subject: subs: Rename shp_nav(), lnd_mar()
X-Git-Tag: v4.3.33~109
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=74a71aa007eb75c6adfec4cefca52a8aebf5e634

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 cf26f82fe..74d59514c 100644
--- 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_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 *);
diff --git a/include/ship.h b/include/ship.h
index 90427b494..ed005af1f 100644
--- 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 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 *);
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 7d57dc718..2f3445940 100644
--- 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
-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;
diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index e8f39137e..ea13e57d3 100644
--- 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
-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;
diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c
index baa5974ae..e0e6a0706 100644
--- 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)
-	    shp_nav(list, player->cnum);
+	    shp_nav_stay_behind(list, player->cnum);
 	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");