[Freeciv-Dev] (PR#2575) define CITY_TILES in city.h

["Gregory Berkolaiko via RT" <rt@xxxxxxxxxxxxxx>]

I located another use for this define.

In client/agents/cma_core.c there is 
#define MAX_FIELDS_USED         (CITY_MAP_SIZE * CITY_MAP_SIZE - 4 - 1)

which is actually only used as (MAX_FIELDS_USED + 1).

There are following options: 
1. MAX_FIELDS_USED + 1 is substituted with CITY_TILES throughtout 
cma_core.c and the define is removed
2. MAX_FIELDS_USED is left where it is, but the define is changed to 
#define MAX_FIELDS_USED         (CITY_TILES - 1)

Raimar, which you would prefer.

In general, when I know Raimar's opinion, I intend to commit the patch 
straight away.  So speak up or forever be silent.

G.


On Sat, 14 Dec 2002, Karen Yeats via RT wrote:

> When Gregory fixed up my starting position allocation patch, he added
> ,local to that function only, a #define for the number of tiles a city
> can see.  I wondered if that was something that would be useful to have
> in city.h for everyone to use.  Looking through the code I found 3 other
> places where that value is used (in city.h and city.c) so it seems like
> it is probably worthwhile.  There is also always the off chance that the
> shape of what the city can see might change in the future and hence so
> would the way that the number of tiles a city can see depends on
> CITY_MAP_SIZE.
> 
> Attached is a diff on today's CVS to do so.
> 
> 
> Karen
>