Remove option TRADESHIPS, customize table ship-chr instead

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

diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index c54f8e859cd6857161481fe195d7b7a9afc26629..46a582c533b9459077e2ab12c0547aaa420e3596 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -27,14 +27,14 @@
  *  scut.c: Scuttle ships, planes or land units
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2009
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
 
 #include <ctype.h>
 #include "commands.h"
-#include "empobj.h"
+#include "news.h"
 #include "optlist.h"
 #include "unit.h"
 
@@ -125,7 +125,7 @@ scut(void)
 
        if (type == EF_SHIP) {
            mp = &mchr[(int)item.ship.shp_type];
-           if (opt_TRADESHIPS && (mp->m_flags & M_TRADE)) {
+           if (mp->m_flags & M_TRADE) {
                if (!scuttle_tradeship(&item.ship, 1))
                    continue;
            }
@@ -137,7 +137,7 @@ scut(void)
            }
        }
        pr("%s scuttled in %s\n",
-          obj_nameof(&item.gen),
+          unit_nameof(&item.gen),
           xyas(item.gen.x, item.gen.y, player->cnum));
        getsect(item.gen.x, item.gen.y, &sect);
        if (sect.sct_own == item.gen.own)