/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2014, 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/>.
*
* ---
*
* ---
*
* xdump.c: Extended dump
- *
+ *
* Known contributors to this file:
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2011
*/
#include <config.h>
#include "commands.h"
#include "empobj.h"
#include "optlist.h"
-#include "version.h"
#include "xdump.h"
/*
xdvisible(int type, void *p)
{
struct empobj *gp = p;
- struct trtstr *tp = p;
struct lonstr *lp = p;
struct natstr *natp;
int tlev;
+ 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_SHIP_CHR:
tlev = ((struct mchrstr *)p)->m_tech;
goto tech;
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.
+ */
+static int
+xdmeta(struct xdstr *xd, int type)
+{
+ struct castr *ca = ef_cadef(type);
+ int i;
+ int n = 0;
+
+ if (!ca)
+ return RET_SYN;
+
+ xdhdr(xd, ef_nameof(type), 1);
+ xdcolhdr(xd, ca);
+
+ 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)
+ continue;
+ xdflds(xd, mdchr_ca, &ca[i]);
+ xd->pr("\n");
+ n++;
+ }
+
+ xdftr(xd, n);
+
+ return RET_OK;
+}
+
/*
* Dump items of type TYPE selected by ARG to XD.
* Return RET_OK on success, RET_SYN on error.
if (!ca)
return RET_SYN;
- if (!snxtitem(&ni, type, arg))
+ if (!snxtitem(&ni, type, arg, NULL))
return RET_SYN;
xdhdr(xd, ef_nameof(type), 0);
if (!p || !*p)
return RET_SYN;
- xdinit(&xd, player->cnum, 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)
pr("Access to table %s denied\n", ef_nameof(type));
return RET_FAIL;
}
- if (type == EF_VERSION && !player->argp[2])
- return xditem(&xd, type, "*"); /* backward compatibility */
return xditem(&xd, type, player->argp[2]);
}