/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, 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,
* 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/>.
*
* ---
*
* scut.c: Scuttle ships, planes or land units
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2008
+ * 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"
return RET_SYN;
}
sprintf(prompt, "%s(s)? ", ef_nameof(type));
- if ((p = getstarg(player->argp[2], prompt, buf)) == 0)
+ if (!(p = getstarg(player->argp[2], prompt, buf)))
return RET_SYN;
if (!snxtitem(&ni, type, p, NULL))
return RET_SYN;
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;
}
}
}
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, §);
if (sect.sct_own == item.gen.own)
mp = &mchr[(int)sp->shp_type];
getsect(sp->shp_x, sp->shp_y, §);
if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2
- && 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 */