empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(xdump): Use xditem() for all empfile tables.

Browse source 
(xdchr, xdmeta): Specialize for meta-tables, rename.
This commit is contained in:
Markus Armbruster 2005-10-29 16:44:53 +00:00
parent 9f038ff7a5
commit d6581717f2
1 changed files with 11 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/lib/commands/xdump.c
View file

@ -55,7 +55,6 @@
* Less important: * Less important:
* - News item characteristics: rpt[] * - News item characteristics: rpt[]
* - News page headings: page_headings[] (TODO) * - News page headings: page_headings[] (TODO)
* - Treaty clause characteristics: tchr[]
* - Commands: player_coms[] (TODO) * - Commands: player_coms[] (TODO)
* - Options: Options[] * - Options: Options[]
* - Configuration: configkeys[] * - Configuration: configkeys[]
@ -243,47 +242,23 @@ xditem(int type, char *arg)
} }
/* /*
* Dump characteristics described by chr_camap[IDX]. * Dump meta-data for items of type TYPE.
* Return RET_OK on success, RET_SYN if IDX < 0. * Return RET_OK.
* FIXME Merge into xditem() when nxtitem() is ready for it.
*/ */
static int static int
xdchr(int chridx, int meta) xdmeta(int type)
{ {
struct empfile *ef = &empfile[chridx]; struct castr *ca = ef_cadef(type);
struct castr *ca = ef->cadef; int i;
char *p;
struct valstr val;
int n;
int size;
if (meta) { xdhdr(ef_nameof(type), mdchr_ca, 1);
p = (char *)ca;
size = sizeof(struct castr);
ca = mdchr_ca;
} else {
p = ef->cache;
size = ef->size;
ca = ef->cadef;
}
xdhdr(ef->name, ca, meta); for (i = 0; ca[i].ca_name; i++) {
xdflds(mdchr_ca, &ca[i]);
n = 0;
for (;; p += size) {
val.val_type = ca[0].ca_type;
val.val_cat = NSC_OFF;
val.val_as.sym.off = ca[0].ca_off;
val.val_as.sym.idx = 0;
nstr_exec_val(&val, player->cnum, p, NSC_STRING);
if (!val.val_as.str.base || !*val.val_as.str.base)
break;
++n;
xdflds(ca, p);
pr("\n"); pr("\n");
} }
xdftr(n); xdftr(i);
return RET_OK; return RET_OK;
} }
@ -368,8 +343,8 @@ xdump(void)
type = ef_byname(p); type = ef_byname(p);
if (type >= 0) { if (type >= 0) {
if (meta || !EF_IS_GAME_STATE(type)) if (meta)
return xdchr(type, meta); return xdmeta(type);
else else
return xditem(type, player->argp[2]); return xditem(type, player->argp[2]);
} else if (!strncmp(p, "opt", strlen(p))) { } else if (!strncmp(p, "opt", strlen(p))) {