/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2014, 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-2008
+ * Markus Armbruster, 2004-2011
*/
#include <config.h>
#include <ctype.h>
#include "commands.h"
#include "empobj.h"
-#include "news.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:
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)
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]);
}