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 570cb89aa6427de7d54db94c1482bd285c793efb..46a582c533b9459077e2ab12c0547aaa420e3596 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -28,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"
 
@@ -126,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;
            }
@@ -138,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)
@@ -165,8 +164,7 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     mp = &mchr[(int)sp->shp_type];
     getsect(sp->shp_x, sp->shp_y, &sect);
     if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2
-       && (sect.sct_own == sp->shp_own
-           || getrel(getnatp(sect.sct_own), sp->shp_own) >= FRIENDLY)) {
+       && relations_with(sect.sct_own, sp->shp_own) >= FRIENDLY) {
        dist = mapdist(sp->shp_x, sp->shp_y,
                       sp->shp_orig_x, sp->shp_orig_y);
        /* Don't disclose distance to to pirates */