Update copyright notice

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

diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c
index b8feae56e2ff83b673b642c692de8fe2e7613ea6..f39eedb53f1864871129e6fc7228dccee0de2975 100644 (file)
--- a/src/lib/commands/strv.c
+++ b/src/lib/commands/strv.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,27 +25,20 @@
  *  ---
  *
  *  star.c: Do a starvation report
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
 
 #include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
+#include "commands.h"
 #include "item.h"
-#include "ship.h"
-#include "optlist.h"
 #include "land.h"
-#include "commands.h"
+#include "optlist.h"
+#include "ship.h"
+#include "update.h"
 
 static void starv_sects(char *range);
 static void starv_ships(char *range);
@@ -136,7 +128,7 @@ starv_sects(char *range)
            sect_hdr();
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        pr(" %c", sect.sct_own != sect.sct_oldown ? '*' : ' ');
        if (sect.sct_newtype != sect.sct_type)
@@ -162,7 +154,7 @@ sect_hdr(void)
 {
     if (player->god)
        pr("    ");
-    pr("Starvation               \n");
+    pr("Starvation\n");
     if (player->god)
        pr("own ");
     pr("  sect         eff ");
@@ -177,7 +169,7 @@ starv_ships(char *range)
     int nship = 0;
     int s;
 
-    if (!snxtitem(&ni, EF_SHIP, range))
+    if (!snxtitem(&ni, EF_SHIP, range, NULL))
        return;
 
     while (nxtitem(&ni, &ship)) {
@@ -211,10 +203,10 @@ ship_hdr(void)
 {
     if (player->god)
        pr("    ");
-    pr("Starvation               \n");
+    pr("Starvation\n");
     if (player->god)
        pr("own ");
-    pr(" shp#     ship type       \n");
+    pr(" shp#     ship type\n");
 }
 
 static void
@@ -225,7 +217,7 @@ starv_units(char *range)
     int nunit = 0;
     int s;
 
-    if (!snxtitem(&ni, EF_LAND, range))
+    if (!snxtitem(&ni, EF_LAND, range, NULL))
        return;
 
     while (nxtitem(&ni, &land)) {
@@ -259,8 +251,8 @@ unit_hdr(void)
 {
     if (player->god)
        pr("    ");
-    pr("Starvation               \n");
+    pr("Starvation\n");
     if (player->god)
        pr("own ");
-    pr(" lnd#     unit type       \n");
+    pr(" lnd#     unit type\n");
 }