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

Change fairland not to reject small worlds without trying

Browse source 
Instead, print a warning and try.  It may well work, and when it
doesn't, it fails cleanly.
(cherry picked from commit de81e4e20a)
This commit is contained in:
Markus Armbruster 2010-02-06 21:36:21 +01:00
parent aab337d2e3
commit 065881143e
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/util/fairland.c
View file

@ -420,10 +420,9 @@ parse_args(int argc, char *argv[])
exit(1); exit(1);
} }
if (nc * sc + nc * my_sqrt(sc) * 2 * (di + 1) > WORLD_X * WORLD_Y) { if (nc * sc + nc * my_sqrt(sc) * 2 * (di + 1) > WORLD_X * WORLD_Y) {
puts("fairland: error -- world not big enough to fit continents."); puts("fairland: warning -- world might be too small to fit continents.");
puts("arguments must satisfy:"); puts("arguments should satisfy:");
puts("nc*sc*sc + nc*sqrt(sc)*2*(di+1) < WORLD_X * WORLD_Y"); puts("nc*sc*sc + nc*sqrt(sc)*2*(di+1) < WORLD_X * WORLD_Y");
exit(1);
} }
} }