(check_nav, shp_check_nav, sail_nav_fleet, retreat_ship1):

Make shp_check_nav() public.
Remove check_nav(), replace with shp_check_nav().
No functional change as check_nav() and shp_check_nav() are
identical.

diff --git a/include/prototypes.h b/include/prototypes.h
index 3d1c8421f5f7ff8da7df422e34067bb2f9e100b8..5e9bbf9b698f675062525fb5a1c8b2fada5e16a7 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -684,6 +684,7 @@ extern int shp_sweep(struct emp_qelem *, int, natid);
 extern s_char *shp_path(int, struct shpstr *, s_char *);
 extern void shp_put(struct emp_qelem *, natid);
 extern void shp_list(struct emp_qelem *);
+extern int shp_check_nav(struct sctstr *);
 extern int shp_hardtarget(struct shpstr *);
 extern void shp_view(struct emp_qelem *);
 extern int shp_nav_one_sector(struct emp_qelem *, int, natid, int);
@@ -762,7 +763,6 @@ extern void prod_nat(int);
 /* nav_ship.c */
 extern int nav_ship(register struct shpstr *);
 /* nav_util.c */
-extern int check_nav(struct sctstr *);
 extern int load_it(struct shpstr *, struct sctstr *,
                   int);
 extern void unload_it(struct shpstr *);

diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index c61da1e0ee37bdd5efaae17fb2c14e7e5439d096..1484d4e6c66ff5acc2505a614131cfcb3650f6d4 100644 (file)
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -188,7 +188,7 @@ retreat_ship1(struct shpstr *sp, s_char code, int orig)
     }
 
     getsect(sp->shp_x, sp->shp_y, &sect);
-    switch (check_nav(&sect)) {
+    switch (shp_check_nav(&sect)) {
     case CN_CONSTRUCTION:
        wu(0, sp->shp_own,
           "%s %s,\nbut was caught in a construction zone, and couldn't retreat!\n",
@@ -262,7 +262,7 @@ retreat_ship1(struct shpstr *sp, s_char code, int orig)
        mobcost = 480.0 / (mobcost + techfact(sp->shp_tech, mobcost));
 
        getsect(newx, newy, &sect);
-       if (check_nav(&sect) != CN_NAVIGABLE ||
+       if (shp_check_nav(&sect) != CN_NAVIGABLE ||
            (sect.sct_own && !player->owner &&
             getrel(getnatp(sect.sct_own), sp->shp_own) < FRIENDLY)) {
            wu(0, sp->shp_own, "%s %s,\nbut could not retreat to %s!\n",

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 7526ebb9624024c0428b7328525e047886aff5a5..8b9270b9b0593687bbfa8164c5977cda6de3d046 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -55,7 +55,6 @@
 #include "server.h"
 #include "prototypes.h"
 
-static int shp_check_nav(struct sctstr *);
 static int shp_check_one_mines(struct mlist *);
 static int shp_hit_mine(struct shpstr *, struct mchrstr *);
 static void shp_mess(s_char *, struct mlist *);
@@ -368,7 +367,7 @@ shp_mess(s_char *str, struct mlist *mlp)
     free(mlp);
 }
 
-static int
+int
 shp_check_nav(struct sctstr *sect)
 {
     switch (dchr[sect->sct_type].d_flg & 03) {

diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c
index 2051ab85e509b8cab039cea724e8407dcdce6cbc..e11da4ea2bad49e42e106de767c75f2c21bb7f53 100644 (file)
--- a/src/lib/update/nav_util.c
+++ b/src/lib/update/nav_util.c
@@ -54,28 +54,6 @@
 #include "common.h"
 #include "gen.h"
 
-/* Format a ship name */
-int
-check_nav(struct sctstr *sect)
-{
-    switch (dchr[sect->sct_type].d_flg & 03) {
-    case NAVOK:
-       break;
-
-    case NAV_02:
-       if (sect->sct_effic < 2)
-           return CN_CONSTRUCTION;
-       break;
-    case NAV_60:
-       if (sect->sct_effic < 60)
-           return CN_CONSTRUCTION;
-       break;
-    default:
-       return CN_LANDLOCKED;
-    }
-    return CN_NAVIGABLE;
-}
-
 /* load a specific ship given its 
  * location and what field to modify.
  * new autonav code

diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c
index 401a83226e1b090b7c8696d2cbd333114867146b..666cacf85237a814bccce08e1401a2e078a081b2 100644 (file)
--- a/src/lib/update/sail.c
+++ b/src/lib/update/sail.c
@@ -239,7 +239,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
     wu(0, fltp->own, "\n");
 #endif
     sectp = getsectp(fltp->x, fltp->y);
-    switch (check_nav(sectp)) {
+    switch (shp_check_nav(sectp)) {
     case CN_NAVIGABLE:
        break;
     case CN_CONSTRUCTION: