Update copyright notice

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

diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c
index 069b4d78d1157bede48ccb48374f1a32961df98a..fd5da7394983dbd38d192755bbc602b93775f4de 100644 (file)
--- a/src/lib/commands/cuto.c
+++ b/src/lib/commands/cuto.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-2008, 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,17 +31,10 @@
  *     David Muir Sharnoff, 1987
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "deity.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
+#include "path.h"
 
 int
 cuto(void)
@@ -50,8 +43,7 @@ cuto(void)
     int nsect;
     int n;
     struct nstr_sect nstr;
-    s_char dirstr[12];
-    int del[I_MAX + 1];
+    char dirstr[12];
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -72,37 +64,36 @@ cuto(void)
        }
        if (player->god)
            pr("%3d", sect.sct_own);
-       getvec(VT_DEL, del, (s_char *)&sect, EF_SECTOR);
-       pr("%7s", xyas(nstr.x, nstr.y, player->cnum));
+       prxy("%3d,%-3d", nstr.x, nstr.y, player->cnum);
        pr(" %c ", dchr[sect.sct_type].d_mnem);
-       pr("%c", dirstr[del[I_CIVIL] & 0x7]);
-       pr("%c", dirstr[del[I_MILIT] & 0x7]);
-       pr("%c", dirstr[del[I_UW] & 0x7]);
-       pr("%c", dirstr[del[I_FOOD] & 0x7]);
-       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]);
-       pr("%4d", del[I_CIVIL] & ~0x7);
-       pr("%4d", del[I_MILIT] & ~0x7);
-       pr("%4d", del[I_UW] & ~0x7);
-       pr("%4d", del[I_FOOD] & ~0x7);
-       pr("%4d", del[I_SHELL] & ~0x7);
-       pr("%4d", del[I_GUN] & ~0x7);
-       pr("%4d", del[I_PETROL] & ~0x7);
-       pr("%4d", del[I_IRON] & ~0x7);
-       pr("%4d", del[I_DUST] & ~0x7);
-       pr("%4d", del[I_BAR] & ~0x7);
-       pr("%4d", del[I_OIL] & ~0x7);
-       pr("%4d", del[I_LCM] & ~0x7);
-       pr("%4d", del[I_HCM] & ~0x7);
-       pr("%4d", del[I_RAD] & ~0x7);
+       pr("%c", dirstr[sect.sct_del[I_CIVIL] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_MILIT] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_UW] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_FOOD] & 0x7]);
+       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]);
+       pr("%4d", sect.sct_del[I_CIVIL] & ~0x7);
+       pr("%4d", sect.sct_del[I_MILIT] & ~0x7);
+       pr("%4d", sect.sct_del[I_UW] & ~0x7);
+       pr("%4d", sect.sct_del[I_FOOD] & ~0x7);
+       pr("%4d", sect.sct_del[I_SHELL] & ~0x7);
+       pr("%4d", sect.sct_del[I_GUN] & ~0x7);
+       pr("%4d", sect.sct_del[I_PETROL] & ~0x7);
+       pr("%4d", sect.sct_del[I_IRON] & ~0x7);
+       pr("%4d", sect.sct_del[I_DUST] & ~0x7);
+       pr("%4d", sect.sct_del[I_BAR] & ~0x7);
+       pr("%4d", sect.sct_del[I_OIL] & ~0x7);
+       pr("%4d", sect.sct_del[I_LCM] & ~0x7);
+       pr("%4d", sect.sct_del[I_HCM] & ~0x7);
+       pr("%4d", sect.sct_del[I_RAD] & ~0x7);
        pr("\n");
     }
     if (nsect == 0) {