Update copyright notice

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

diff --git a/src/lib/commands/supp.c b/src/lib/commands/supp.c
index a432f1baa254301b5874a2e8e0819db112db4443..ce88c95ea839b893e9e5978a0e83d08b13ffae9b 100644 (file)
--- a/src/lib/commands/supp.c
+++ b/src/lib/commands/supp.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-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,64 +14,54 @@
  *  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.
  *
  *  ---
  *
  *  supp.c: supply land units
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  */
 
-#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 <config.h>
+
 #include "commands.h"
+#include "land.h"
 
 int
 supp(void)
 {
-       int     nunits;
-       struct  nstr_item ni;
-       struct  lndstr land;
+    int nunits;
+    struct nstr_item ni;
+    struct lndstr land;
 
-       if (!snxtitem(&ni, EF_LAND, player->argp[1]))
-               return RET_SYN;
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
+       return RET_SYN;
 
-       nunits = 0;
-       while (nxtitem(&ni, (s_char *)&land)) {
-               if (!player->owner || land.lnd_own == 0)
-                       continue;
-               nunits++;
-               resupply_all(&land);
-               putland(land.lnd_uid,&land);
-               if (has_supply(&land))
-                       pr("%s has supplies\n", prland(&land));
-               else
-                       pr("%s is out of supply\n", prland(&land));
-       }
-       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;
+    nunits = 0;
+    while (nxtitem(&ni, &land)) {
+       if (!player->owner || land.lnd_own == 0)
+           continue;
+       nunits++;
+       if (lnd_supply_all(&land))
+           pr("%s has supplies\n", prland(&land));
+       else
+           pr("%s is out of supply\n", prland(&land));
+    }
+    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;
 }