COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index 87c223cdbec1e71f252e4c6aaef4b5a73c95be61..b570fc0bd13fcfe6202017400609064e80d85f99 100644 (file)
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,36 +31,32 @@
  *     
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
-#include "var.h"
 #include "sect.h"
 #include "xy.h"
 #include "nsc.h"
 #include "path.h"
 #include "nat.h"
-#include "deity.h"
-#include "file.h"
 #include "commands.h"
 
-static void prthresh(s_char *format, int val);
+static void prthresh(s_char *format, int val);
 
 int
 comm(void)
 {
-    struct     sctstr sect;
-    s_char     dirstr[12];
-    int        nsect;
-    int        n;
-    struct     nstr_sect nstr;
-    int        del[I_MAX+1];
-    int        dist[I_MAX+1];
-    int        item[I_MAX+1];
-    
+    struct sctstr sect;
+    s_char dirstr[12];
+    int nsect;
+    int n;
+    struct nstr_sect nstr;
+
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
     prdate();
-    (void) strcpy(dirstr, ".      $");
+    (void)strcpy(dirstr, ".      $");
     n = 1;
     for (n = 1; n <= 6; n++)
        dirstr[n] = dirch[n];
@@ -78,41 +74,38 @@ comm(void)
        }
        if (player->god)
            pr("%3d", sect.sct_own);
-       getvec(VT_DEL, del, (s_char *)&sect, EF_SECTOR);
-       getvec(VT_DIST, dist, (s_char *)&sect, EF_SECTOR);
-       getvec(VT_ITEM, item, (s_char *)&sect, EF_SECTOR);
        prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
        pr(" %c", dchr[sect.sct_type].d_mnem);
-       pr(" %c", dirstr[del[I_SHELL] & 0x7]);
-       pr("%c", dirstr[del[I_GUN] & 0x7]);
-       pr("%c", dirstr[del[I_PETROL] & 0x7]);
-       pr("%c", dirstr[del[I_IRON] & 0x7]);
-       pr("%c", dirstr[del[I_DUST] & 0x7]);
-       pr("%c", dirstr[del[I_BAR] & 0x7]);
-       pr("%c", dirstr[del[I_OIL] & 0x7]);
-       pr("%c", dirstr[del[I_LCM] & 0x7]);
-       pr("%c", dirstr[del[I_HCM] & 0x7]);
-       pr("%c", dirstr[del[I_RAD] & 0x7]);
-       prthresh(" %c", dist[I_SHELL]);
-       prthresh("%c", dist[I_GUN]);
-       prthresh("%c", dist[I_PETROL]);
-       prthresh("%c", dist[I_IRON]);
-       prthresh("%c", dist[I_DUST]);
-       prthresh("%c", dist[I_BAR]);
-       prthresh("%c", dist[I_OIL]);
-       prthresh("%c", dist[I_LCM]);
-       prthresh("%c", dist[I_HCM]);
-       prthresh("%c", dist[I_RAD]);
-       pr("%4d", item[I_SHELL]);
-       pr("%4d", item[I_GUN]);
-       pr("%5d", item[I_PETROL]);
-       pr("%5d", item[I_IRON]);
-       pr("%5d", item[I_DUST]);
-       pr("%4d", item[I_BAR]);
-       pr("%5d", item[I_OIL]);
-       pr("%5d", item[I_LCM]);
-       pr("%5d", item[I_HCM]);
-       pr("%4d", item[I_RAD]);
+       pr(" %c", dirstr[sect.sct_del[I_SHELL] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_GUN] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_PETROL] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_IRON] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_DUST] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_BAR] & 0x7]);
+       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("%4d", sect.sct_item[I_SHELL]);
+       pr("%4d", sect.sct_item[I_GUN]);
+       pr("%5d", sect.sct_item[I_PETROL]);
+       pr("%5d", sect.sct_item[I_IRON]);
+       pr("%5d", sect.sct_item[I_DUST]);
+       pr("%4d", sect.sct_item[I_BAR]);
+       pr("%5d", sect.sct_item[I_OIL]);
+       pr("%5d", sect.sct_item[I_LCM]);
+       pr("%5d", sect.sct_item[I_HCM]);
+       pr("%4d", sect.sct_item[I_RAD]);
        pr("\n");
     }
     if (nsect == 0) {
@@ -121,7 +114,7 @@ comm(void)
        else
            pr("%s: No sector(s)\n", "");
        return RET_FAIL;
-    }else
+    } else
        pr("%d sector%s\n", nsect, splur(nsect));
     return 0;
 }
@@ -137,5 +130,3 @@ prthresh(s_char *format, int val)
        val = '.';
     pr(format, val);
 }
-
-