/*
* 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-2017, 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.
*
* ---
*
* comm.c: Do a commodity report
- *
+ *
* Known contributors to this file:
- *
+ *
*/
-#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 <config.h>
+
#include "commands.h"
+#include "path.h"
-static void prthresh(s_char *format, int val);
+static void prthresh(int val);
int
comm(void)
{
struct sctstr sect;
- s_char dirstr[12];
+ 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];
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
prdate();
(void)strcpy(dirstr, ". $");
- n = 1;
for (n = 1; n <= 6; n++)
dirstr[n] = dirch[n];
nsect = 0;
}
if (player->god)
pr("%3d", sect.sct_own);
- getvec(VT_DEL, del, (s_char *)§, EF_SECTOR);
- getvec(VT_DIST, dist, (s_char *)§, EF_SECTOR);
- getvec(VT_ITEM, item, (s_char *)§, EF_SECTOR);
- prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+ prxy("%4d,%-4d", nstr.x, nstr.y);
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(sect.sct_dist[I_SHELL]);
+ prthresh(sect.sct_dist[I_GUN]);
+ prthresh(sect.sct_dist[I_PETROL]);
+ prthresh(sect.sct_dist[I_IRON]);
+ prthresh(sect.sct_dist[I_DUST]);
+ prthresh(sect.sct_dist[I_BAR]);
+ prthresh(sect.sct_dist[I_OIL]);
+ prthresh(sect.sct_dist[I_LCM]);
+ prthresh(sect.sct_dist[I_HCM]);
+ prthresh(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) {
}
static void
-prthresh(s_char *format, int val)
+prthresh(int val)
{
if (val >= 1000)
val = 'a';
val = val / 100 + '0';
else
val = '.';
- pr(format, val);
+ pr("%c", val);
}