<URL: http://bugs.freeciv.org/Ticket/Display.html?id=17435 >

> [book - Thu Dec 11 23:56:50 2008]:
> 
> I have confirmed that the island generator (gen 3) will
> sometimes place islands in a way that there is no ocean
> between them. I have also tested the patch and it solved
> the problem in all my tests. Since the code looks fine I
> will commit it soon (if no objections are raised).

And here is the trunk version of the patch.


-----------------------------------------------------------------------
俺は代数をもっと学びたい。
diff --git a/server/generator/mapgen.c b/server/generator/mapgen.c
index 3756a65..402df67 100644
--- a/server/generator/mapgen.c
+++ b/server/generator/mapgen.c
@@ -1613,9 +1613,7 @@ static bool is_near_land(struct tile *ptile)
 {
   /* Note this function may sometimes be called on land tiles. */
   adjc_iterate(ptile, tile1) {
-    const struct terrain *pterrain1 = tile_terrain(tile1);
-    if (T_UNKNOWN != pterrain1
-        && !terrain_has_flag(pterrain1, TER_OCEANIC)) {
+    if (!is_ocean(tile_terrain(tile1))) {
       return TRUE;
     }
   } adjc_iterate_end;
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to