/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* xdump.c: Extended dump
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2011
+ * Markus Armbruster, 2004-2016
*/
#include <config.h>
#include <ctype.h>
#include "commands.h"
#include "empobj.h"
-#include "news.h"
#include "optlist.h"
-#include "product.h"
-#include "version.h"
#include "xdump.h"
/*
- * Is object P of type TYPE visible to the player?
+ * Is object @p of type @type visible to the player?
* TODO: Fold this into interators.
*/
static int
xdvisible(int type, void *p)
{
struct empobj *gp = p;
- struct trtstr *tp = p;
struct lonstr *lp = p;
struct natstr *natp;
int tlev;
- char *name;
+
+ if (!empobj_in_use(type, p))
+ return 0;
switch (type) {
case EF_SECTOR:
- case EF_REALM:
- return gp->own == player->cnum || player->god;
case EF_SHIP:
case EF_PLANE:
case EF_LAND:
case EF_NUKE:
case EF_LOST:
- return gp->own != 0 && (gp->own == player->cnum || player->god);
- case EF_NATION:
- return ((struct natstr *)p)->nat_stat != STAT_UNUSED;
+ case EF_REALM:
+ return gp->own == player->cnum || player->god;
case EF_COUNTRY:
return gp->own == player->cnum;
case EF_NEWS:
- return ((struct nwsstr *)p)->nws_vrb != 0
- && (!opt_HIDDEN || player->god); /* FIXME */
- case EF_TREATY:
- return tp->trt_status != TS_FREE
- && (tp->trt_cna == player->cnum || tp->trt_cnb == player->cnum
- || player->god);
+ return !opt_HIDDEN || player->god; /* FIXME */
case EF_LOAN:
- if (lp->l_status == LS_FREE)
- return 0;
if (lp->l_status == LS_SIGNED)
return 1;
return lp->l_loner == player->cnum || lp->l_lonee == player->cnum
|| player->god;
- case EF_TRADE:
- case EF_COMM:
- return gp->own != 0;
- case EF_PRODUCT:
- return ((struct pchrstr *)p)->p_sname[0] != 0;
case EF_SHIP_CHR:
tlev = ((struct mchrstr *)p)->m_tech;
- name = ((struct mchrstr *)p)->m_name;
goto tech;
case EF_PLANE_CHR:
tlev = ((struct plchrstr *)p)->pl_tech;
- name = ((struct plchrstr *)p)->pl_name;
goto tech;
case EF_LAND_CHR:
tlev = ((struct lchrstr *)p)->l_tech;
- name = ((struct lchrstr *)p)->l_name;
tech:
natp = getnatp(player->cnum);
- if (!name[0])
- return 0;
return player->god || tlev <= (int)(1.25 * natp->nat_level[NAT_TLEV]);
case EF_NUKE_CHR:
tlev = ((struct nchrstr *)p)->n_tech;
- name = ((struct nchrstr *)p)->n_name;
if (drnuke_const > MIN_DRNUKE_CONST) {
natp = getnatp(player->cnum);
if (tlev > (int)((int)(1.25 * natp->nat_level[NAT_RLEV])
return player->god;
}
goto tech;
- case EF_NEWS_CHR:
- return ((struct rptstr *)p)->r_newspage != 0;
case EF_TABLE:
return ((struct empfile *)p)->cadef != NULL;
default:
}
/*
- * Dump meta-data for items of type TYPE to XD.
- * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
+ * Dump meta-data for items of type @type to @xd.
+ * Return RET_SYN when @type doesn't have meta-data, else RET_OK.
*/
static int
xdmeta(struct xdstr *xd, int type)
for (i = 0; ca[i].ca_name; i++) {
if (ca[i].ca_flags & NSC_DEITY && !xd->divine)
continue;
- if (ca[i].ca_flags & NSC_EXTRA)
+ if (ca[i].ca_dump == CA_DUMP_NONE)
continue;
xdflds(xd, mdchr_ca, &ca[i]);
xd->pr("\n");
}
/*
- * Dump items of type TYPE selected by ARG to XD.
+ * Dump items of type @type selected by @arg to @xd.
* Return RET_OK on success, RET_SYN on error.
*/
static int
struct castr *ca;
struct nstr_item ni;
int n;
- char buf[2048]; /* FIXME buffer size? */
+ unsigned char buf[EF_WITH_CADEF_MAX_ENTRY_SIZE];
ca = ef_cadef(type);
if (!ca)
if (!p || !*p)
return RET_SYN;
- xdinit(&xd, player->cnum, 0, pr);
+ xdinit(&xd, player->cnum, 0, 0, pr);
natp = getnatp(player->cnum);
type = isdigit(p[0]) ? atoi(p) : ef_byname(p);
if (type < 0 || type >= EF_MAX)