[Freeciv-Dev] (PR#9768) Re: (PR#9733) ocean patch bug

["Gregory Berkolaiko" <Gregory.Berkolaiko@xxxxxxxxxxxxx>]

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

On Wed, 18 Aug 2004, Jason Short wrote:

> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9733 >
> 
> See PR#9637.
> 
> Does this patch still need to be applied?

I was about to apply it when I had a better idea.  Since explorers are now 
PF-based, PF ensures that they don't go to wrong continents, so we can 
just skip the continent consideration altogether.

New patch will be applied soon.

G.

Index: ai/aiexplorer.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aiexplorer.c,v
retrieving revision 1.2
diff -u -r1.2 aiexplorer.c
--- ai/aiexplorer.c     13 Aug 2004 15:59:11 -0000      1.2
+++ ai/aiexplorer.c     26 Aug 2004 21:50:59 -0000
@@ -167,15 +167,6 @@
   int range = unit_type(punit)->vision_range;
   int desirable = 0;
   int unknown = 0;
-  Continent_id continent;
-
-  /* Localize the unit */
-  
-  if (is_ground_unit(punit)) {
-    continent = map_get_continent(x, y);
-  } else {
-    continent = 0;
-  }
 
   /* First do some checks that would make a tile completely non-desirable.
    * If we're a trireme and we could die at the given tile, or if there
@@ -185,7 +176,6 @@
   if ((unit_flag(punit, F_TRIREME) && 
        is_likely_trireme_loss(pplayer, x, y))
       || map_get_city(x, y)
-      || map_get_continent(x, y) != continent
       || (is_barbarian(pplayer) && map_has_special(x, y, S_HUT))) {
     return 0;
   }