From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 6 Feb 2010 20:36:21 +0000 (+0100)
Subject: Change fairland not to reject small worlds without trying
X-Git-Tag: hvy-plastic-2.0^0
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=065881143ea47adf235a82d11a6db8801a71e71f

Change fairland not to reject small worlds without trying

Instead, print a warning and try.  It may well work, and when it
doesn't, it fails cleanly.
(cherry picked from commit de81e4e20a40489fa2074060b4220ebb761025c8)
---

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 255183660..e95b33d33 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -420,10 +420,9 @@ parse_args(int argc, char *argv[])
 	exit(1);
     }
     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("arguments must satisfy:");
+	puts("fairland: warning -- world might be too small to fit continents.");
+	puts("arguments should satisfy:");
 	puts("nc*sc*sc + nc*sqrt(sc)*2*(di+1) < WORLD_X * WORLD_Y");
-	exit(1);
     }
 }