Update copyright notice

[empserver] / src / util / fairland.c

diff --git a/src/util/fairland.c b/src/util/fairland.c
index b8ed01468920c5c67a3d59bfc7459ebdfc17176f..eba88b20452b1a270cecc997ac300ba0e4d0a99e 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2013
  */
 
 #include <config.h>
@@ -72,7 +72,6 @@ static int quiet = 0;
 #include <stdio.h>
 #include <unistd.h>
 #include "chance.h"
-#include "file.h"
 #include "optlist.h"
 #include "prototypes.h"
 #include "sect.h"
@@ -321,12 +320,13 @@ usage(void)
           "  -a              airport marker for continents\n"
           "  -e CONFIG-FILE  configuration file\n"
           "                  (default %s)\n"
-          "  -h              display this help and exit\n"
           "  -i              islands may merge\n"
           "  -o              don't set resources\n"
           "  -q              quiet\n"
           "  -R SEED         seed for random number generator\n"
           "  -s SCRIPT       name of script to create (default %s)\n"
+          "  -h              display this help and exit\n"
+          "  -v              display version information and exit\n"
           "  NC              number of continents\n"
           "  SC              continent size\n"
           "  NI              number of islands (default NC)\n"
@@ -378,10 +378,7 @@ parse_args(int argc, char *argv[])
        sp = atoi(argv[4]);
     else
        sp = DEFAULT_SPIKE;
-    if (sp < 0)
-       sp = 0;
-    if (sp > 100)
-       sp = 100;
+    sp = LIMIT_TO(sp, 0, 100);
 
     if (argc > 5)
        pm = atoi(argv[5]);
@@ -812,7 +809,7 @@ grow_islands(void)
        secs = 0;
        if (!place_island(c, &x, &y))
            return;
-       isiz = roll(2 * is - 1);
+       isiz = roll(is) + roll0(is);
        do {
            ++secs;
            find_coast(c);
@@ -1083,6 +1080,7 @@ write_sects(void)
                sct->sct_type = SCT_MOUNT;
            sct->sct_elev = total;
            sct->sct_newtype = sct->sct_type;
+           sct->sct_dterr = own[sct->sct_x][y] + 1;
            if (ORE)
                add_resources(sct);
        }