Replace common pattern by new LIMIT_TO()

[empserver] / src / util / fairland.c

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