subs: Rename shp_put() to shp_nav_put()

For consistency with lnd_mar_put().

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

diff --git a/include/ship.h b/include/ship.h
index 81c2f0868a3d470d53aac328b440798b18eece1d..fcdf41a651955558202becd3146e499595221905 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -185,7 +185,7 @@ extern double shp_torp_hitchance(struct shpstr *, int);
 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 *, 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 enum d_navigation shp_check_nav(struct shpstr *, struct sctstr *);
 extern int sect_has_dock(struct sctstr *);

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index ffa06b20f03c22f959d8596ed4640a331c5bf872..6587945df3d057504e85c280eab9ad420cfeb922 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -181,7 +181,7 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
 }
 
 void
-shp_put(struct emp_qelem *list, natid actor)
+shp_nav_put(struct emp_qelem *list, natid actor)
 {
     struct emp_qelem *qp, *next;
     struct ulist *mlp;
@@ -779,7 +779,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
     int navigate;
 
     if (dir <= DIR_STOP || dir >= DIR_VIEW) {
-       shp_put(list, actor);
+       shp_nav_put(list, actor);
        return 1;
     }
     dx = diroff[dir][0];

diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index 1d6a19846e11d5dcbe136205e0722e7c393240cf..255321435ab34546e07985ecf967cad5813729ff 100644 (file)
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -270,7 +270,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
            fltp->maxmoves = 1;
        --fltp->maxmoves;
     }
-    shp_put(&ship_list, own);
+    shp_nav_put(&ship_list, own);
     getship(sp->shp_uid, &ship);
     fltp->x = ship.shp_x;
     fltp->y = ship.shp_y;