Revert "Make fairland finish argument parsing before reading econfig"

This reverts commit d2a7bb6b6fed02d2cf48682d7d2a52a16d5d90e9.

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>

diff --git a/src/util/fairland.c b/src/util/fairland.c
index c94f2b47d9001abbf68de5a270574292d57965c2..9dca8aa2ce2ede02cadb002179af19cacc98d785 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -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();