Update copyright notice

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

diff --git a/src/lib/commands/lstat.c b/src/lib/commands/lstat.c
index 9745920b312f7cde01b914d3b01b4039d95a5d5a..e3f0bccb6bcf556addd2c34419773554073ca687 100644 (file)
--- a/src/lib/commands/lstat.c
+++ b/src/lib/commands/lstat.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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,73 +14,58 @@
  *  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.
  *
  *  ---
  *
  *  lstat.c: Show the stats of your land units
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "deity.h"
-#include "file.h"
-#include "optlist.h"
+#include <config.h>
+
 #include "commands.h"
+#include "land.h"
 
 int
-lstats(void)
+lsta(void)
 {
     int nunits;
     struct nstr_item ni;
     struct lndstr land;
-    s_char *mission_short_name();
+    struct lchrstr *lcp;
 
-    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)) {
+    while (nxtitem(&ni, &land)) {
        if (!player->owner || land.lnd_own == 0)
            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);
-
+       lcp = lchr + land.lnd_type;
        if (nunits++ == 0) {
            pr("     %16.16s                                 s  v  s  r  r  a  f  a  a\n", "");
            pr("     %16.16s                                 p  i  p  a  n  c  i  m  a\n", "");
            pr("lnd# %16.16s    x,y    eff tech att def vul  d  s  y  d  g  c  r  m  f\n", "unit-type");
        }
-       pr("%4d %-16.16s ", land.lnd_uid, lchr[(int)land.lnd_type].l_name);
-       prxy("%4d,%-4d", land.lnd_x, land.lnd_y, player->cnum);
+       pr("%4d %-16.16s ", land.lnd_uid, lcp->l_name);
+       prxy("%4d,%-4d", land.lnd_x, land.lnd_y);
        pr(" %3d%% %3d %1.1f %1.1f %3d ",
-          land.lnd_effic,
-          land.lnd_tech,
-          (float)land.lnd_att, (float)land.lnd_def, land.lnd_vul);
+          land.lnd_effic, land.lnd_tech, lnd_att(&land), lnd_def(&land),
+          lnd_vul(&land));
        pr("%2d %2d %2d %2d ",
-          land.lnd_spd, land.lnd_vis, land.lnd_spy, land.lnd_rad);
+          lnd_spd(&land), lnd_vis(&land), lcp->l_spy, lcp->l_rad);
        pr("%2d %2d %2d %2d %2d ",
-          land.lnd_frg,
-          land.lnd_acc, land.lnd_dam, land.lnd_ammo, land.lnd_aaf);
+          lnd_frg(&land), lnd_acc(&land), lnd_dam(&land),
+          lcp->l_ammo, lnd_aaf(&land));
        pr("\n");
     }
     if (nunits == 0) {