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

ef_verify: Cover sector coordinates in game state verification

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-01-27 10:27:36 +01:00
parent 0f3134fc15
commit 22d39b9afa
1 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Ron Koenderink, 2005 * Ron Koenderink, 2005
* Markus Armbruster, 2006-2011 * Markus Armbruster, 2006-2013
*/ */
#include <config.h> #include <config.h>
@ -209,6 +209,27 @@ verify_table(int type)
return retval; return retval;
} }
static int
verify_sectors(int may_put)
{
int i;
struct sctstr *sp;
coord x, y;
/* laziness: assumes sector file is EFF_MEM */
for (i = 0; (sp = getsectid(i)); i++) {
sctoff2xy(&x, &y, sp->sct_uid);
if (sp->sct_x != x || sp->sct_y != y) {
sp->sct_x = x;
sp->sct_y = y;
if (may_put)
putsect(sp);
verify_fail(EF_SECTOR, i, NULL, 0, "bogus coordinates (fixed)");
}
}
return 0;
}
static int static int
verify_planes(int may_put) verify_planes(int may_put)
{ {
@ -351,6 +372,7 @@ ef_verify_state(int may_put)
} }
/* Special checks */ /* Special checks */
retval |= verify_sectors(may_put);
retval |= verify_planes(may_put); retval |= verify_planes(may_put);
retval |= verify_lands(may_put); retval |= verify_lands(may_put);
retval |= verify_nukes(may_put); retval |= verify_nukes(may_put);