Update copyright notice

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

diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index 5032e7272bbe42ce05c54d846b006bc29da9b4f1..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-2007, 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,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,16 +25,16 @@
  *  ---
  *
  *  land.c: List land units
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
 
 #include "commands.h"
 #include "land.h"
-#include "optlist.h"
 
 int
 land(void)
@@ -44,7 +43,7 @@ land(void)
     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 = noff = 0;
@@ -53,16 +52,11 @@ land(void)
            continue;
        if (!player->owner && !player->god)
            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 xl ln carry\n");
+           pr("   # unit type          x,y    a   eff mil frt  mu  fd"
+              " tch retr xl ln carry\n");
        }
        if (land.lnd_off)
            noff++;
@@ -70,20 +64,17 @@ land(void)
            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);
+       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(" %4dS", land.lnd_ship);
        else if (land.lnd_land >= 0)