Update copyright notice

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

diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index f8105309e156be69f72c0fa66f78ad0f41f7023a..a21206022539be2b03fca90bd60006807586ea52 100644 (file)
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2017, 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,40 +14,34 @@
  *  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.
  *
  *  ---
  *
  *  comm.c: Do a commodity report
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#include "misc.h"
-#include "player.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
-#include "nat.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "path.h"
 
-static void prthresh(s_char *format, int val);
+static void prthresh(int val);
 
 int
 comm(void)
 {
     struct sctstr sect;
-    s_char dirstr[12];
+    char dirstr[12];
     int nsect;
     int n;
     struct nstr_sect nstr;
@@ -56,7 +50,6 @@ comm(void)
        return RET_SYN;
     prdate();
     (void)strcpy(dirstr, ".      $");
-    n = 1;
     for (n = 1; n <= 6; n++)
        dirstr[n] = dirch[n];
     nsect = 0;
@@ -73,7 +66,7 @@ comm(void)
        }
        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", dirstr[sect.sct_del[I_SHELL] & 0x7]);
        pr("%c", dirstr[sect.sct_del[I_GUN] & 0x7]);
@@ -84,17 +77,17 @@ comm(void)
        pr("%c", dirstr[sect.sct_del[I_OIL] & 0x7]);
        pr("%c", dirstr[sect.sct_del[I_LCM] & 0x7]);
        pr("%c", dirstr[sect.sct_del[I_HCM] & 0x7]);
-       pr("%c", dirstr[sect.sct_del[I_RAD] & 0x7]);
-       prthresh(" %c", sect.sct_dist[I_SHELL]);
-       prthresh("%c", sect.sct_dist[I_GUN]);
-       prthresh("%c", sect.sct_dist[I_PETROL]);
-       prthresh("%c", sect.sct_dist[I_IRON]);
-       prthresh("%c", sect.sct_dist[I_DUST]);
-       prthresh("%c", sect.sct_dist[I_BAR]);
-       prthresh("%c", sect.sct_dist[I_OIL]);
-       prthresh("%c", sect.sct_dist[I_LCM]);
-       prthresh("%c", sect.sct_dist[I_HCM]);
-       prthresh("%c", sect.sct_dist[I_RAD]);
+       pr("%c ", dirstr[sect.sct_del[I_RAD] & 0x7]);
+       prthresh(sect.sct_dist[I_SHELL]);
+       prthresh(sect.sct_dist[I_GUN]);
+       prthresh(sect.sct_dist[I_PETROL]);
+       prthresh(sect.sct_dist[I_IRON]);
+       prthresh(sect.sct_dist[I_DUST]);
+       prthresh(sect.sct_dist[I_BAR]);
+       prthresh(sect.sct_dist[I_OIL]);
+       prthresh(sect.sct_dist[I_LCM]);
+       prthresh(sect.sct_dist[I_HCM]);
+       prthresh(sect.sct_dist[I_RAD]);
        pr("%4d", sect.sct_item[I_SHELL]);
        pr("%4d", sect.sct_item[I_GUN]);
        pr("%5d", sect.sct_item[I_PETROL]);
@@ -119,7 +112,7 @@ comm(void)
 }
 
 static void
-prthresh(s_char *format, int val)
+prthresh(int val)
 {
     if (val >= 1000)
        val = 'a';
@@ -127,5 +120,5 @@ prthresh(s_char *format, int val)
        val = val / 100 + '0';
     else
        val = '.';
-    pr(format, val);
+    pr("%c", val);
 }