Update copyright notice

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

diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c
index cb285f24f178e10f48c6008a05b21571f02eb33c..0ed55f7184cd88086720cf407dae94030c5359f7 100644 (file)
--- a/src/lib/commands/land.c
+++ b/src/lib/commands/land.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,100 +19,80 @@
  *
  *  ---
  *
- *  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
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
 #include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "deity.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
 
 int
 land(void)
 {
-       int     nunits;
-       struct  nstr_item ni;
-       struct  lndstr land;
-       int     vec[I_MAX+1];
-       s_char  *mission_short_name();
-
-       if (!snxtitem(&ni, EF_LAND, player->argp[1]))
-               return RET_SYN;
+    int nunits, noff;
+    struct nstr_item ni;
+    struct lndstr land;
 
-       nunits = 0;
-       while (nxtitem(&ni, (s_char *)&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 (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
+       return RET_SYN;
 
-               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");
-               }
-               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));
-               pr("%4d", land.lnd_harden);
-               pr("%4d", land.lnd_mobil);
-               getvec(VT_ITEM, vec, (s_char *)&land, EF_LAND);
-               pr("%4d", vec[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);
-               if (land.lnd_ship >= 0)
-                       pr(" S%4d", land.lnd_ship);
-               else if (land.lnd_land >= 0)
-                       pr(" L%4d", land.lnd_land);
-               pr("\n");
+    nunits = noff = 0;
+    while (nxtitem(&ni, &land)) {
+       if (land.lnd_own == 0)
+           continue;
+       if (!player->owner && !player->god)
+           continue;
+       if (nunits++ == 0) {
+           if (player->god)
+               pr("own ");
+           pr("   # unit type          x,y   a   eff mil frt  mu  fd");
+           pr(" tch retr xl ln carry\n");
        }
-       if (nunits == 0) {
-               if (player->argp[1])
-                       pr("%s: No unit(s)\n", player->argp[1]);
-               else
-                       pr("%s: No unit(s)\n", "");
-               return RET_FAIL;
-       }else
-               pr("%d unit%s\n", nunits, splur(nunits));
-       return RET_OK;
+       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("%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]);
+       pr("%4d ", land.lnd_tech);
+       pr("%3d%%", land.lnd_retreat);
+       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)
+           pr(" %4dL", land.lnd_land);
+       pr("\n");
+    }
+    if (nunits == 0) {
+       if (player->argp[1])
+           pr("%s: No unit(s)\n", player->argp[1]);
+       else
+           pr("%s: No unit(s)\n", "");
+       return RET_FAIL;
+    } else {
+       pr("%d unit%s", nunits, splur(nunits));
+       if (noff)
+           pr(", %d stopped (eff marked with !)", noff);
+       pr("\n");
+    }
+    return RET_OK;
 }