Update copyright notice

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

diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c
index 811fc1c41e68fea04c2d55d8372265433d726fa2..9da280421f4486f2dd2ce55afb5d6c98ff7c1ab4 100644 (file)
--- a/src/lib/commands/cens.c
+++ b/src/lib/commands/cens.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-2013, 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,30 +14,27 @@
  *  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.
  *
  *  ---
  *
  *  cens.c: Do a census report
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     
  */
 
 #include <config.h>
 
-#include "prototypes.h"
-#include "path.h"
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
 static void cens_hdr(void);
 
@@ -48,7 +45,7 @@ cens(void)
     int nsect;
     int n;
     struct nstr_sect nstr;
-    s_char dirstr[20];
+    char dirstr[20];
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -66,7 +63,7 @@ cens(void)
            cens_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);
        if (sect.sct_newtype != sect.sct_type)
            pr("%c", dchr[sect.sct_newtype].d_mnem);
@@ -87,9 +84,9 @@ cens(void)
        n = sect.sct_dist[I_FOOD] % 1000;
        pr("%c ", n == 0 ? '.' : '0' + (n / 100));
        if (sect.sct_own != sect.sct_oldown)
-         pr("%3d",  sect.sct_oldown);
+           pr("%3d",  sect.sct_oldown);
        else
-         pr("   ");
+           pr("   ");
 
        pr("%5d", sect.sct_item[I_CIVIL]);
        pr("%5d", sect.sct_item[I_MILIT]);
@@ -103,9 +100,7 @@ cens(void)
            else
                pr("    ");
        }
-       if (opt_FALLOUT) {
-           pr("%5d", sect.sct_fallout);
-       }
+       pr("%5d", opt_FALLOUT ? sect.sct_fallout : 0);
        if (sect.sct_coastal)
            pr("%4d", sect.sct_coastal);
        pr("\n");
@@ -134,9 +129,6 @@ cens_hdr(void)
     pr("mob uf uf old  civ  mil   uw food work avail ");
     if (!player->god)
        pr("ter ");
-    if (opt_FALLOUT)
-       pr("fall ");
-    pr("coa");
-    pr("\n");
+    pr("fall coa\n");
 }