[Freeciv-Dev] (PR#2589) Prevent friendly city from getting generated when a goodie hut is close to one of player's cities

["esr@xxxxxxxxxxx via RT" <rt@xxxxxxxxxxxxxx>]

This patch prevents a friendly city from getting generated by piling into a 
good, when the goodie hut is close to one of player's cities.

-- 
                <a href="http://www.tuxedo.org/~esr/";>Eric S. Raymond</a>

--- server/unittools.c  2002/12/16 12:19:07     1.1
+++ server/unittools.c  2002/12/16 12:19:53
@@ -2439,13 +2439,15 @@
 }
 
 /**************************************************************************
-  Get new city from hut, or settlers (nomads) if terrain is poor.
+  Get new city from hut, or settlers (nomads) if terrain is poor
+  or we're near another city,
 **************************************************************************/
 static void hut_get_city(struct unit *punit)
 {
   struct player *pplayer = unit_owner(punit);
   
-  if (city_can_be_built_here(punit->x, punit->y)) {
+  if (city_can_be_built_here(punit->x, punit->y) 
+               && !city_exists_within_city_radius(punit->x, punit->y, TRUE)) {
     notify_player_ex(pplayer, punit->x, punit->y, E_HUT_CITY,
                     _("Game: You found a friendly city."));
     create_city(pplayer, punit->x, punit->y,