/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2016, 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/>.
*
* ---
*
* ---
*
* stop.c: Stop a sector or unit from producing
- *
+ *
* Known contributors to this file:
- * Thomas Ruschak, 1992
+ * Thomas Ruschak, 1992
* Steve McClure, 1998
- * Markus Armbruster, 2006-2008
+ * Markus Armbruster, 2006-2013
*/
#include <config.h>
#include <ctype.h>
#include "commands.h"
#include "empobj.h"
-#include "path.h"
static int start_stop(int);
static int start_stop_sector(char *, int);
} else {
p = getstarg(player->argp[1],
"Sector, ship, plane, land unit or nuke? ", buf);
- if (p == 0)
+ if (!p)
return RET_SYN;
type = ef_byname_from(p, sct_or_unit);
if (type < 0) {
start_stop_hdr(off);
if (player->god)
pr("%3d ", sect.sct_own);
- prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+ prxy("%4d,%-4d", nstr.x, nstr.y);
pr(" %c", dchr[sect.sct_type].d_mnem);
if (sect.sct_newtype != sect.sct_type)
pr("%c", dchr[sect.sct_newtype].d_mnem);
prdate();
nunit = 0;
while (nxtitem(&nstr, &unit)) {
- if (!player->owner)
+ if (!player->owner || !unit.gen.own)
continue;
if (!unit.gen.off == !off)
continue;
if (player->god)
pr("%3d ", unit.gen.own);
pr("%4d %-4.4s ", nstr.cur, empobj_chr_name(&unit.gen));
- prxy("%4d,%-4d", unit.gen.x, unit.gen.y, player->cnum);
+ prxy("%4d,%-4d", unit.gen.x, unit.gen.y);
pr("%4d%%", unit.gen.effic);
proff(off);
unit.gen.off = off;