Update copyright notice

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

diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index c7d2fa76c695f28587962e5948a6b85e4a437059..7b96124b697196a2005ad858a88af90850a56f0e 100644 (file)
--- a/src/lib/commands/land.c
+++ b/src/lib/commands/land.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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,90 +14,71 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  land.c: List land units
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2013
  */
 
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
-#include "optlist.h"
+#include <config.h>
+
 #include "commands.h"
+#include "land.h"
 
 int
 land(void)
 {
-    int nunits;
+    int nunits, noff;
     struct nstr_item ni;
     struct lndstr land;
 
-    if (!snxtitem(&ni, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
 
-    nunits = 0;
-    while (nxtitem(&ni, (s_char *)&land)) {
+    nunits = noff = 0;
+    while (nxtitem(&ni, &land)) {
        if (land.lnd_own == 0)
            continue;
        if (!player->owner && !player->god)
            continue;
-       if (land.lnd_type < 0 || land.lnd_type > lnd_maxno) {
-           pr("bad unit type %d (#%d)\n", land.lnd_type, ni.cur);
-           continue;
-       }
-       count_land_planes(&land);
-       lnd_count_units(&land);
-
        if (nunits++ == 0) {
            if (player->god)
                pr("own ");
-           pr("   # unit type          x,y   a  eff mil frt  mu  fd");
-           if (opt_FUEL)
-               pr(" fl");
-           pr(" tch retr rd");
-           pr(" xl");
-           pr(" ln");
-           pr(" l/s\n");
+           pr("   # unit type          x,y    a   eff mil frt  mu  fd"
+              " tch retr xl ln carry\n");
        }
+       if (land.lnd_off)
+           noff++;
        if (player->god)
            pr("%3d ", land.lnd_own);
        pr("%4d ", ni.cur);
        pr("%-15.15s", lchr[(int)land.lnd_type].l_name);
-       prxy(" %4d,%-4d", land.lnd_x, land.lnd_y, player->cnum);
-       pr("%c", land.lnd_army);
-       pr("%4d%%", land.lnd_effic);
-       pr("%4d", lnd_getmil(&land));
+       prxy(" %4d,%-4d ", land.lnd_x, land.lnd_y);
+       pr("%1.1s", &land.lnd_army);
+       pr(" %c%3d%%", land.lnd_off ? '!' : ' ', land.lnd_effic);
+       pr("%4d", land.lnd_item[I_MILIT]);
        pr("%4d", land.lnd_harden);
        pr("%4d", land.lnd_mobil);
        pr("%4d", land.lnd_item[I_FOOD]);
-       if (opt_FUEL)
-           pr("%3d", land.lnd_fuel);
        pr("%4d ", land.lnd_tech);
        pr("%3d%%", land.lnd_retreat);
-       pr("%3d", land.lnd_rad_max);
-       pr("%3d", land.lnd_nxlight);
-       pr("%3d", land.lnd_nland);
+       pr("%3d", lnd_nxlight(&land));
+       pr("%3d", lnd_nland(&land));
        if (land.lnd_ship >= 0)
-           pr(" S%4d", land.lnd_ship);
+           pr(" %4dS", land.lnd_ship);
        else if (land.lnd_land >= 0)
-           pr(" L%4d", land.lnd_land);
+           pr(" %4dL", land.lnd_land);
        pr("\n");
     }
     if (nunits == 0) {
@@ -106,7 +87,11 @@ land(void)
        else
            pr("%s: No unit(s)\n", "");
        return RET_FAIL;
-    } else
-       pr("%d unit%s\n", nunits, splur(nunits));
+    } else {
+       pr("%d unit%s", nunits, splur(nunits));
+       if (noff)
+           pr(", %d stopped (eff marked with !)", noff);
+       pr("\n");
+    }
     return RET_OK;
 }