Author: cazfi Date: Wed Feb 24 07:22:29 2016 New Revision: 32054 URL: http://svn.gna.org/viewcvs/freeciv?rev=32054&view=rev Log: When founding a city, restore previous real tile owner as starting point for the owner changes resulting from removal of extras. That way borders claimed by territory claiming bases get handled correctly.
See bug #23436 Modified: branches/S2_6/server/citytools.c Modified: branches/S2_6/server/citytools.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/citytools.c?rev=32054&r1=32053&r2=32054&view=diff ============================================================================== --- branches/S2_6/server/citytools.c (original) +++ branches/S2_6/server/citytools.c Wed Feb 24 07:22:29 2016 @@ -1487,6 +1487,10 @@ /* Update citizens. */ citizens_update(pcity, nationality); + /* Restore the old-owner information so removal + * of territory claiming bases can work relative to it. */ + tile_set_owner(ptile, saved_owner, saved_claimer); + /* Destroy any extras that don't belong in the city. */ extra_type_iterate(pextra) { if (tile_has_extra(ptile, pextra) @@ -1499,7 +1503,6 @@ upgrade_city_extras(pcity, NULL); /* Claim the ground we stand on */ - tile_set_owner(ptile, saved_owner, saved_claimer); map_claim_ownership(ptile, pplayer, ptile, TRUE); /* Before arranging workers to show unknown land */ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits