[Freeciv-Dev] Re: Natural City Names

[Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx>]

On Wed, Nov 07, 2001 at 01:00:24PM -0500, Cameron Morland wrote:
> La 2001-11-07, Raimar Falke skribis:
> 
> > > The patches are available at the following location:
> > >
> > > <www.eng.uwaterloo.ca/~cjmorlan/freeciv/natural_citynames-data.diff>
> > > <www.eng.uwaterloo.ca/~cjmorlan/freeciv/natural_citynames-code.diff>
> >
> > Is this an offical submission for inclusion or more like a RFC? If it
> > is the first: can you resubmit if with the tracking system and can
> > people please comment on this?
> 
> I believe that the code is robust, so I would like to submit it. The
> patches are attached, and I'm also sending it to bugs@freeciv. (I was
> having trouble sending to the list, so I'm not sure this will work.)

> diff -u -3 -p -r1.146 citytools.c
> --- server/citytools.c        2001/10/06 21:02:02     1.146
> +++ server/citytools.c        2001/11/04 13:53:11
> @@ -67,16 +67,59 @@ Returned pointer points into internal da
>  buffer etc, and should be considered read-only (and not freed)
>  by caller.
>  *****************************************************************/
> -char *city_name_suggestion(struct player *pplayer)
> +char *city_name_suggestion(struct player *pplayer, int x, int y)
>  {
>    char **nptr;
>    int i, j;
>    static char tempname[MAX_LEN_NAME];
> +  int type;

Change int to enum tile_terrain_type.

> +  if(is_real_tile(x, y)) {

Make it an assert.

> +  int type;

Same.

Does anybody have checked the rearrangement of the city names?

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "> WHY?! Isn't it better to put $(shell cat cscope.files) on the list of
  I only have a yellow belt in makefile kungfu.  These fancy gnu make things
  are relatively new to some of us..."
    -- Mark Frazer to Vassilii Khachaturov in linux-kernel