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

fairland: Drop "might be too small to fit continents" warning

Browse source 
Commit de81e4e20 "Change fairland not to reject small worlds without
trying" (v4.3.25) downgraded it from error to warning, pointing out it
the size may well work, and when it doesn't, fairland fails cleanly.

When it works, the warning is pointless.  When it doesn't, it's
redundant.  Drop it.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-08-02 07:02:20 +02:00
parent 2e63b6e02a
commit a6ac42d5f6
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/util/fairland.c
View file

@ -347,19 +347,6 @@ print_vars(void)
printf("World dimensions: %dx%d\n", WORLD_X, WORLD_Y); printf("World dimensions: %dx%d\n", WORLD_X, WORLD_Y);
} }
static int
my_sqrt(int n)
{
int i;
for (i = 1; i * i < n * 10000; ++i) ;
return (i + 50) / 100;
}
/****************************************************************************
PARSE COMMAND LINE ARGUMENTS
****************************************************************************/
static void static void
help(char *complaint) help(char *complaint)
{ {
@ -466,11 +453,6 @@ parse_args(int argc, char *argv[])
puts("fairland: error -- distance from islands to continents too large"); puts("fairland: error -- distance from islands to continents too large");
exit(1); exit(1);
} }
if (nc * sc + nc * my_sqrt(sc) * 2 * (di + 1) > WORLD_X * WORLD_Y) {
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");
}
} }
/**************************************************************************** /****************************************************************************