[Freeciv-Dev] Re: [RFC] Behaviour of units in eXplore mode near cities

[Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx>]

On Sun, Feb 17, 2002 at 09:29:23PM +0000, Gregory Berkolaiko wrote:
>  --- Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx> wrote: 
> > On Sun, Feb 17, 2002 at 07:10:08PM +0000, Gregory Berkolaiko wrote:
> > >  --- Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx> wrote: 
> > > > > 
> > > > >         /* We won't travel into cities, unless we are able to do so -
> > > > diplomats
> > > > >          * and caravans can. */
> > > > >         /* FIXME/TODO: special flag for this? --pasky */
> > > > >         /* FIXME: either comment or code is wrong here :-) --pasky */
> > > > >         if (map_get_city(x1, y1) && (unit_flag(punit, F_DIPLOMAT) ||
> > > > >                                      unit_flag(punit, F_CARAVAN)))
> > > > >           continue;
> > > > > 
> > > > 
> > > > I would suggest changing the comment to something like:
> > > >  Traveling into cities is special for diplomats and caravans. So skip
> > > > them.
> > > 
> > > Eh?
> > > I didn't quite understand what Petr said but I think the code is wrong.
> > > There should be ! before testing for flags...
> > 
> > Test it. If you disable the if altogether or invert it thing you will
> > get popup at the client side that a diplomat or caravan have entered
> > the city. IMHO the if is there to prevent this. And yes the comment
> > has to be updated. And yes this may lead to sub-optimal paths for
> > diplomats and caravans.
> 
> yep, you are right.
> than nobody should go to cities while exploring (explorers shouldn't attack,
> right?)

We could expand the test to
  if (map_get_city(x1, y1) && (unit_flag(punit, F_DIPLOMAT) ||
                               unit_flag(punit, F_CARAVAN)) ||
                               is_military_unit(punit))

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "The BeOS takes the best features from the major operating systems. 
  It's got the power and flexibility of Unix, the interface and ease 
  of use of the MacOS, and Minesweeper from Windows."