Update copyright notice.

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

diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c
index 9d035cfaed6e893c730a1e0a85011bd3e09c0698..f9ca649efa98957b2ccb7d2794edcb9f77af0fc7 100644 (file)
--- a/src/lib/commands/cens.c
+++ b/src/lib/commands/cens.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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -39,7 +39,6 @@
 #include "sect.h"
 #include "nsc.h"
 #include "nat.h"
-#include "deity.h"
 #include "path.h"
 #include "file.h"
 #include "commands.h"
@@ -55,7 +54,6 @@ cens(void)
     int n;
     struct nstr_sect nstr;
     s_char dirstr[20];
-    int vec[I_MAX + 1];
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -86,22 +84,19 @@ cens(void)
            pr("    ");
        pr("%4d", sect.sct_mobil);
 
-       getvec(VT_DEL, vec, (s_char *)&sect, EF_SECTOR);
-       pr(" %c", dirstr[vec[I_UW] & 0x7]);
-       pr("%c", dirstr[vec[I_FOOD] & 0x7]);
+       pr(" %c", dirstr[sect.sct_del[I_UW] & 0x7]);
+       pr("%c", dirstr[sect.sct_del[I_FOOD] & 0x7]);
 
-       getvec(VT_DIST, vec, (s_char *)&sect, EF_SECTOR);
-       n = vec[I_UW] % 1000;
+       n = sect.sct_dist[I_UW] % 1000;
        pr(" %c", n == 0 ? '.' : '0' + (n / 100));
-       n = vec[I_FOOD] % 1000;
+       n = sect.sct_dist[I_FOOD] % 1000;
        pr("%c ", n == 0 ? '.' : '0' + (n / 100));
        pr("%c", sect.sct_own != sect.sct_oldown ? '*' : ' ');
 
-       getvec(VT_ITEM, vec, (s_char *)&sect, EF_SECTOR);
-       pr("%5d", vec[I_CIVIL]);
-       pr("%5d", vec[I_MILIT]);
-       pr("%5d", vec[I_UW]);
-       pr("%5d", vec[I_FOOD]);
+       pr("%5d", sect.sct_item[I_CIVIL]);
+       pr("%5d", sect.sct_item[I_MILIT]);
+       pr("%5d", sect.sct_item[I_UW]);
+       pr("%5d", sect.sct_item[I_FOOD]);
        pr("%4d%%", sect.sct_work);
        pr("%5d", sect.sct_avail);
        if (!player->god) {
@@ -111,8 +106,7 @@ cens(void)
                pr("    ");
        }
        if (opt_FALLOUT) {
-           getvec(VT_COND, vec, (void *)&sect, EF_SECTOR);
-           pr("%5d", vec[C_FALLOUT]);
+           pr("%5d", sect.sct_fallout);
        }
        set_coastal(&sect);
        if (sect.sct_coastal)