From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 11 Aug 2020 05:51:30 +0000 (+0200)
Subject: fairland: Move "is water" check into try_to_grow()
X-Git-Tag: v4.4.1~125
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=f314ead777fcb70092f03bc4af5b89ffda9f8541

fairland: Move "is water" check into try_to_grow()

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/src/util/fairland.c b/src/util/fairland.c
index 00e1aa102..644412c5c 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -662,6 +662,9 @@ try_to_grow(int c, int newx, int newy, int d)
 {
     int i, j, px, py;
 
+    if (own[newx][newy] != -1)
+	return 0;
+
     for (i = 1; i <= d; ++i) {
 	for (j = 0; j < i; ++j)
 	    vector[j] = 0;
@@ -757,10 +760,9 @@ grow_one_sector(int c)
 	    for (i = roll0(6), n = 0; n < 12 && !done; i = (i + 1) % 6, ++n) {
 		newx = new_x(x + dirx[i]);
 		newy = new_y(y + diry[i]);
-		if (own[newx][newy] == -1 &&
-		    (n > 5 ||
-		     (own[new_x(x+dirx[(i+5)%6])][new_y(y+diry[(i+5)%6])] == -1 &&
-		      own[new_x(x+dirx[(i+1)%6])][new_y(y+diry[(i+1)%6])] == -1)))
+		if (n > 5 ||
+		    (own[new_x(x+dirx[(i+5)%6])][new_y(y+diry[(i+5)%6])] == -1 &&
+		     own[new_x(x+dirx[(i+1)%6])][new_y(y+diry[(i+1)%6])] == -1))
 		    if (try_to_grow(c, newx, newy, c < nc ? di : id))
 			done = 1;
 	    }
@@ -768,9 +770,8 @@ grow_one_sector(int c)
 	    for (i = roll0(6), n = 0; n < 6 && !done; i = (i + 1) % 6, ++n) {
 		newx = new_x(x + dirx[i]);
 		newy = new_y(y + diry[i]);
-		if (own[newx][newy] == -1)
-		    if (try_to_grow(c, newx, newy, c < nc ? di : id))
-			done = 1;
+		if (try_to_grow(c, newx, newy, c < nc ? di : id))
+		    done = 1;
 	    }
 	next_coast(c, x, y, &x, &y);
 	++coast_search;
@@ -843,7 +844,7 @@ place_island(int c, int *xp, int *yp)
 		if (*xp == sx && *yp == sy)
 		    break;
 	    }
-	    if (own[*xp][*yp] == -1 && try_to_grow(c, *xp, *yp, d))
+	    if (try_to_grow(c, *xp, *yp, d))
 		return 1;
 	}
     }