Remove option TRADESHIPS, customize table ship-chr instead

[empserver] / src / lib / update / nav_ship.c

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index 20b8ba0bfb2d9f22bedf1d99bcc9c7f5ad576f0a..16592dffc17b3227b38e0185d35e107880b96d5d 100644 (file)
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.c
@@ -53,8 +53,7 @@ scuttle_it(struct shpstr *sp)
           sp->shp_x, sp->shp_y, sp->shp_uid);
        return;
     }
-    if (CANT_HAPPEN(!opt_TRADESHIPS
-                   || !(mchr[sp->shp_type].m_flags & M_TRADE)))
+    if (CANT_HAPPEN(!(mchr[sp->shp_type].m_flags & M_TRADE)))
        return;
     if (!scuttle_tradeship(sp, 0)) {
        wu(0, sp->shp_own,