]> git.pond.sub.org Git - empserver/blobdiff - src/lib/commands/cens.c
commands: Rename the command functions
[empserver] / src / lib / commands / cens.c
index f808e52d94e6b7e1c9a7faf840c59fd2bc7e075c..29cff4da41a699970dab678b4d2923007ffea023 100644 (file)
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,
  *  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 "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "deity.h"
-#include "path.h"
-#include "file.h"
+#include <config.h>
+
 #include "commands.h"
 #include "optlist.h"
+#include "path.h"
 
-static void cens_hdr(void);
+static void cens_hdr(void);
 
 int
-cens(void)
+c_census(void)
 {
-       struct  sctstr sect;
-       int     nsect;
-       int     n;
-       struct  nstr_sect nstr;
-       s_char  dirstr[20];
-       int     vec[I_MAX+1];
+    struct sctstr sect;
+    int nsect;
+    int n;
+    struct nstr_sect nstr;
+    char dirstr[20];
 
-       if (!snxtsct(&nstr, player->argp[1]))
-               return RET_SYN;
-       prdate();
-       for (n = 1; n <= 6; n++)
-               dirstr[n] = dirch[n];
-       dirstr[0] = '.';
-       dirstr[7] = '$';
-       dirstr[8] = '\0';
-       nsect = 0;
-       while (nxtsct(&nstr, &sect)) {
-               if (!player->owner)
-                       continue;
-               if (nsect++ == 0)
-                       cens_hdr();
-               if (player->god)
-                       pr("%3d ", sect.sct_own);
-               prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
-               pr(" %c", dchr[sect.sct_type].d_mnem);
-               if (sect.sct_newtype != sect.sct_type)
-                       pr("%c", dchr[sect.sct_newtype].d_mnem);
-               else
-                       pr(" ");
-               pr("%4d%%", sect.sct_effic);
-               if (sect.sct_off)
-                       pr(" no ");
-               else
-                       pr("    ");
-               pr("%4d", sect.sct_mobil);
+    if (!snxtsct(&nstr, player->argp[1]))
+       return RET_SYN;
+    prdate();
+    for (n = 1; n <= 6; n++)
+       dirstr[n] = dirch[n];
+    dirstr[0] = '.';
+    dirstr[7] = '$';
+    dirstr[8] = '\0';
+    nsect = 0;
+    while (nxtsct(&nstr, &sect)) {
+       if (!player->owner)
+           continue;
+       if (nsect++ == 0)
+           cens_hdr();
+       if (player->god)
+           pr("%3d ", sect.sct_own);
+       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);
+       else
+           pr(" ");
+       pr("%4d%%", sect.sct_effic);
+       if (sect.sct_off)
+           pr(" no ");
+       else
+           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;
-               pr(" %c", n == 0 ? '.' : '0'+ (n/100));
-               n = vec[I_FOOD] % 1000;
-               pr("%c ", n == 0 ? '.' : '0'+ (n/100));
-               pr("%c", sect.sct_own != sect.sct_oldown ? '*' : ' ');
+       n = sect.sct_dist[I_UW] % 1000;
+       pr(" %c", n == 0 ? '.' : '0' + (n / 100));
+       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);
+       else
+           pr("   ");
 
-               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("%4d%%", sect.sct_work);
-               pr("%5d", sect.sct_avail);
-               if (!player->god) {
-                       if (sect.sct_terr)
-                               pr("%4d", sect.sct_terr);
-                       else
-                               pr("    ");
-               }
-               if (opt_FALLOUT) {
-                 getvec(VT_COND, vec, (void *)&sect, EF_SECTOR);
-                 pr("%5d",vec[C_FALLOUT]);
-               }
-               set_coastal(&sect);
-               if (sect.sct_coastal)
-                       pr("%4d", sect.sct_coastal);
-               pr("\n");
+       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) {
+           if (sect.sct_terr)
+               pr("%4d", sect.sct_terr);
+           else
+               pr("    ");
        }
-       if (nsect == 0) {
-               if (player->argp[1])
-                       pr("%s: No sector(s)\n", player->argp[1]);
-               else
-                       pr("%s: No sector(s)\n", "");
-               return RET_FAIL;
-       }else
-               pr("%d sector%s\n", nsect, splur(nsect));
-       return 0;
+       pr("%5d", opt_FALLOUT ? sect.sct_fallout : 0);
+       if (sect.sct_coastal)
+           pr("%4d", sect.sct_coastal);
+       pr("\n");
+    }
+    if (nsect == 0) {
+       if (player->argp[1])
+           pr("%s: No sector(s)\n", player->argp[1]);
+       else
+           pr("%s: No sector(s)\n", "");
+       return RET_FAIL;
+    } else
+       pr("%d sector%s\n", nsect, splur(nsect));
+    return 0;
 }
 
 static void
 cens_hdr(void)
 {
-       if (player->god)
-               pr("    ");
-       pr("CENSUS                   del dst\n");
-       if (player->god)
-               pr("own ");
-       pr("  sect        eff ");
-       pr("prd ");
-       pr("mob uf uf *  civ  mil   uw food work avail ");
-       if (!player->god)
-               pr("ter ");
-       if (opt_FALLOUT)
-         pr("fall ");
-       pr("coa");
-       pr("\n");
-}
-
-void
-set_coastal(struct sctstr *sp)
-{
-       int     n;
-       struct  sctstr  sect;
-       u_char  start_flags = sp->sct_coastal;
-
-       /* It's already been set, it didn't change (you can't fill
-          in water, even with bridge spans they are still coastal.) */
-       if (sp->sct_coastal)
-           return;
-       for (n = 1; n <= 6; ++n) {      /* Directions */
-               getsect(sp->sct_x + diroff[n][0],
-                       sp->sct_y + diroff[n][1],
-                       &sect);
-               if (sect.sct_type == SCT_WATER ||
-                   sect.sct_type == SCT_BTOWER ||
-                   sect.sct_type == SCT_BSPAN) {
-                       sp->sct_coastal = 1;
-                       if (start_flags != sp->sct_coastal)
-                               putsect(sp);
-                       return;
-               }
-       }
-       sp->sct_coastal = 0;
-       if (start_flags != sp->sct_coastal)
-               putsect(sp);
+    if (player->god)
+       pr("    ");
+    pr("CENSUS                   del dst\n");
+    if (player->god)
+       pr("own ");
+    pr("  sect        eff ");
+    pr("prd ");
+    pr("mob uf uf old  civ  mil   uw food work avail ");
+    if (!player->god)
+       pr("ter ");
+    pr("fall coa\n");
 }