Revert "Make fairland finish argument parsing before reading econfig"
This reverts commit d2a7bb6b6f
.
parse_args() uses WORLD_X and WORLD_Y to check the distance arguments.
Calling it before reading econfig is wrong, because at that time
WORLD_X and WORLD_Y still have the compiled-in default values instead
of the actual ones set in econfig.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
parent
7c593f7e86
commit
21c311dba2
1 changed files with 2 additions and 1 deletions
|
@ -273,7 +273,6 @@ main(int argc, char *argv[])
|
|||
exit(1);
|
||||
}
|
||||
}
|
||||
parse_args(argc - optind, argv + optind);
|
||||
|
||||
if (!seed_set)
|
||||
rnd_seed = pick_seed();
|
||||
|
@ -283,6 +282,8 @@ main(int argc, char *argv[])
|
|||
exit(1);
|
||||
empfile_fixup();
|
||||
|
||||
parse_args(argc - optind, argv + optind);
|
||||
|
||||
allocate_memory();
|
||||
print_vars();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue