(fuel, load, shp_check_nav, retreat_ship1, shp_nav_one_sector)

[empserver] / src / lib / commands / fuel.c

diff --git a/src/lib/commands/fuel.c b/src/lib/commands/fuel.c
index 103e5bac9fe4babbffad2f76b89979b7ed728a21..3634d56f091e18de066ab167deeef38fa94b2048 100644 (file)
--- a/src/lib/commands/fuel.c
+++ b/src/lib/commands/fuel.c
@@ -121,13 +121,9 @@ fuel(void)
            if (!item.ship.shp_own)
                continue;
 
-           if ((sect.sct_type != SCT_HARBR)
-               && (sect.sct_type != SCT_WATER)
-               && (sect.sct_type != SCT_BSPAN)
-               && (!IS_BIG_CITY(sect.sct_type))) {
-               pr("Sector %s is not a harbor, bridge span, or sea.\n",
-                  xyas(item.ship.shp_x, item.ship.shp_y,
-                       item.ship.shp_own));
+           if (shp_check_nav(&sect, &item.ship) == CN_LANDLOCKED) {
+               pr("%s is landlocked and cannot be fueled.\n",
+                  prship(&item.ship));
                continue;
            }