Update copyright notice

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

diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c
index 507c0f54cc9837393fc41391e3cd8ca7510847ce..8339595eebeaa47ec0e5a0d05b5843c3d13ee550 100644 (file)
--- a/src/lib/commands/stop.c
+++ b/src/lib/commands/stop.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2017, 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/>.
  *
  *  ---
  *
@@ -26,32 +25,18 @@
  *  ---
  *
  *  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
+ *     Markus Armbruster, 2006-2013
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
+#include <ctype.h>
 #include "commands.h"
-
-union item_u {
-    struct genitem gen;
-    struct shpstr ship;
-    struct plnstr plane;
-    struct lndstr land;
-    struct nukstr nuke;
-};
+#include "empobj.h"
 
 static int start_stop(int);
 static int start_stop_sector(char *, int);
@@ -59,7 +44,6 @@ static void start_stop_hdr(int);
 static void proff(int);
 static int start_stop_unit(int, char *, int);
 static void start_stop_unit_hdr(int);
-static char *unit_type_name(union item_u *);
 
 int
 start(void)
@@ -90,11 +74,11 @@ start_stop(int off)
     } 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) {
-           pr("Sectors, ships, planes, land units or nukes only!");
+           pr("Sectors, ships, planes, land units or nukes only!\n");
            return RET_SYN;
        }
        arg = player->argp[2];
@@ -125,7 +109,7 @@ start_stop_sector(char *arg, int off)
            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);
@@ -167,16 +151,16 @@ proff(int off)
 static int
 start_stop_unit(int type, char *arg, int off)
 {
-    union item_u unit;
+    union empobj_storage unit;
     int nunit;
     struct nstr_item nstr;
 
-    if (!snxtitem(&nstr, type, arg))
+    if (!snxtitem(&nstr, type, arg, NULL))
        return RET_SYN;
     prdate();
     nunit = 0;
     while (nxtitem(&nstr, &unit)) {
-       if (!player->owner)
+       if (!player->owner || !unit.gen.own)
            continue;
        if (!unit.gen.off == !off)
            continue;
@@ -184,8 +168,8 @@ start_stop_unit(int type, char *arg, int off)
            start_stop_unit_hdr(off);
        if (player->god)
            pr("%3d ", unit.gen.own);
-       pr("%4d %-4.4s ", nstr.cur, unit_type_name(&unit));
-       prxy("%4d,%-4d", unit.gen.x, unit.gen.y, player->cnum);
+       pr("%4d %-4.4s ", nstr.cur, empobj_chr_name(&unit.gen));
+       prxy("%4d,%-4d", unit.gen.x, unit.gen.y);
        pr("%4d%%", unit.gen.effic);
        proff(off);
        unit.gen.off = off;
@@ -209,22 +193,3 @@ start_stop_unit_hdr(int off)
        pr("own ");
     pr("   #         x,y     eff\n");
 }
-
-static char *
-unit_type_name(union item_u *unit)
-{
-    int type = unit->gen.type;
-
-    switch (unit->gen.ef_type) {
-    case EF_SHIP:
-       return mchr[type].m_name;
-    case EF_PLANE:
-       return plchr[type].pl_name;
-    case EF_LAND:
-       return lchr[type].l_name;
-    case EF_NUKE:
-       return nchr[type].n_name;
-    }
-    CANT_REACH();
-    return "?";
-}