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

emp_config: Don't monkey-patch WORLD_X to be even

Browse source 
emp_config() silently truncates WORLD_X to even.  Drop that.  We could
flag odd WORLD_X as error, but we don't validate the other
configuration values, so why this one?  Instead document it needs to
be even.  WORLD_Y, too.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-02-22 08:04:41 +01:00
parent ab82a804a6
commit e60f0be73f
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/econfig-spec.h
View file

@ -28,7 +28,7 @@
* *
* Known contributors to this file: * Known contributors to this file:
* Marc Olzheim, 2004 * Marc Olzheim, 2004
* Markus Armbruster, 2004-2014 * Markus Armbruster, 2004-2015
*/ */
/* /*
@ -108,9 +108,9 @@ EMPCFBOTH("privlog", privlog, char *, NSC_STRING, 0,
EMPCFBOTH("privip", privip, char *, NSC_STRING, KM_INTERNAL, EMPCFBOTH("privip", privip, char *, NSC_STRING, KM_INTERNAL,
"Deities may connect from these IPs or networks, \"\" allows all") "Deities may connect from these IPs or networks, \"\" allows all")
EMPCFBOTH("WORLD_X", WORLD_X, int, NSC_INT, 0, EMPCFBOTH("WORLD_X", WORLD_X, int, NSC_INT, 0,
"World size X dimension (enforced to be even by subtracting 1 if necessary)") "World size X dimension, must be even")
EMPCFBOTH("WORLD_Y", WORLD_Y, int, NSC_INT, 0, EMPCFBOTH("WORLD_Y", WORLD_Y, int, NSC_INT, 0,
"World size Y dimension") "World size Y dimension, must be even")
EMPCF_COMMENT("\n\n### Update policy\n\n" EMPCF_COMMENT("\n\n### Update policy\n\n"
"# Note: the update schedule is defined in the file schedule in the\n" "# Note: the update schedule is defined in the file schedule in the\n"

1
src/lib/common/emp_config.c
View file

@ -138,7 +138,6 @@ emp_config(char *file)
fclose(fp); fclose(fp);
done: done:
WORLD_X &= ~1; /* force even */
if (set_paths(file) < 0) if (set_paths(file) < 0)
return -1; return -1;