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

Factor product code out of ef_verify() into verify_products()

Browse source
This commit is contained in:
Markus Armbruster 2011-05-22 08:42:35 +02:00
parent ca4312061e
commit 3403cb2ecb
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/lib/common/ef_verify.c
View file

@ -277,6 +277,26 @@ verify_nukes(int may_put)
return retval;
}
static int
verify_products(void)
{
int retval = 0;
int i;
/* product makes either level or item, not both */
for (i = 0; pchr[i].p_sname; i++) {
if (!pchr[i].p_sname[0])
continue;
if ((pchr[i].p_type >= 0) == (pchr[i].p_level >= 0)) {
fprintf(stderr,
"Config %s uid %d field level doesn't match field type\n",
ef_nameof(EF_PRODUCT), i);
retval = -1;
}
}
return retval;
}
/*
* Verify game state and configuration are sane.
* Correct minor problems, but write corrections to backing files only
@ -303,16 +323,6 @@ ef_verify(int may_put)
retval |= verify_planes(may_put);
retval |= verify_lands(may_put);
retval |= verify_nukes(may_put);
for (i = 0; pchr[i].p_sname; i++) {
if (!pchr[i].p_sname[0])
continue;
if ((pchr[i].p_type >= 0) == (pchr[i].p_level >= 0)) {
fprintf(stderr,
"Config %s uid %d field level doesn't match field type\n",
ef_nameof(EF_PRODUCT), i);
retval = -1;
}
}
retval |= verify_products();
return retval;
}