[Freeciv-Dev] (PR#7363) 1x1 isles.

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=7363 >

> [tarje - Sun Feb 01 15:57:45 2004]:

> Attached is a patch that always makes 1x1 isles appear on the final map, 
> if they are adjacent to land in NORTH-EAST, SOUTH-EAST, SOUTH-WEST, 
> NORTH-WEST direction. The current code actually regards these as 1x1 
> islands, even though they are accesible from a continent.

The current behavior does seem kindof buggy.  This patch is basically
the same as the one submitted.

1x1 islands currently are those with no *cardinally* adjacent land
tiles.  These are generally disallowed.  This means land that connects
only diagonally to other land will be turned into ocean.  But under the
patch any land that connects to other land isn't considered a "tiny" island.

I'm still not sure if this is an improvement.

jason

Index: server/mapgen.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/mapgen.c,v
retrieving revision 1.139
diff -u -r1.139 mapgen.c
--- server/mapgen.c     9 Jul 2004 19:30:58 -0000       1.139
+++ server/mapgen.c     11 Jul 2004 05:45:21 -0000
@@ -1179,11 +1179,11 @@
     return FALSE;
   }
 
-  cardinal_adjc_iterate(x, y, x1, y1) {
+  adjc_iterate(x, y, x1, y1) {
     if (!is_ocean(map_get_terrain(x1, y1))) {
       return FALSE;
     }
-  } cardinal_adjc_iterate_end;
+  } adjc_iterate_end;
 
   return TRUE;
 }