Author: cazfi
Date: Wed Feb 24 07:22:24 2016
New Revision: 32053
URL: http://svn.gna.org/viewcvs/freeciv?rev=32053&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:
trunk/server/citytools.c
Modified: trunk/server/citytools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=32053&r1=32052&r2=32053&view=diff
==============================================================================
--- trunk/server/citytools.c (original)
+++ trunk/server/citytools.c Wed Feb 24 07:22:24 2016
@@ -1493,6 +1493,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)
@@ -1505,7 +1509,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
