Author: cazfi
Date: Wed Feb 24 07:22:34 2016
New Revision: 32055

URL: http://svn.gna.org/viewcvs/freeciv?rev=32055&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_5/server/citytools.c

Modified: branches/S2_5/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/citytools.c?rev=32055&r1=32054&r2=32055&view=diff
==============================================================================
--- branches/S2_5/server/citytools.c    (original)
+++ branches/S2_5/server/citytools.c    Wed Feb 24 07:22:34 2016
@@ -1501,6 +1501,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);
+
   /* Remove any roads that don't belong in the city. */
   road_type_iterate(proad) {
     if (tile_has_road(ptile, proad)
@@ -1523,7 +1527,6 @@
   upgrade_city_bases(pcity, NULL);
 
   /* Claim the ground we stand on */
-  tile_set_owner(ptile, saved_owner, saved_claimer);
   map_claim_ownership(ptile, pplayer, ptile);
 
   /* Before arranging workers to show unknown land */


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to