Author: cazfi
Date: Mon Nov 17 22:33:43 2014
New Revision: 27071

URL: http://svn.gna.org/viewcvs/freeciv?rev=27071&view=rev
Log:
Do not erronously set base owner to the same value as border owner.

Reported by pepeto <pepeto>

See bug #22946

Modified:
    trunk/common/tile.c
    trunk/server/generator/mapgen.c

Modified: trunk/common/tile.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/tile.c?rev=27071&r1=27070&r2=27071&view=diff
==============================================================================
--- trunk/common/tile.c (original)
+++ trunk/common/tile.c Mon Nov 17 22:33:43 2014
@@ -68,7 +68,6 @@
 {
   if (BORDERS_DISABLED != game.info.borders) {
     ptile->owner = pplayer;
-    ptile->extras_owner = pplayer;
     ptile->claimer = claimer;
   }
 }

Modified: trunk/server/generator/mapgen.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/generator/mapgen.c?rev=27071&r1=27070&r2=27071&view=diff
==============================================================================
--- trunk/server/generator/mapgen.c     (original)
+++ trunk/server/generator/mapgen.c     Mon Nov 17 22:33:43 2014
@@ -2292,6 +2292,7 @@
     map_set_placed(ptile); /* not a land tile */
     BV_CLR_ALL(ptile->extras);
     tile_set_owner(ptile, NULL, NULL);
+    ptile->extras_owner = NULL;
   } whole_map_iterate_end;
 
   if (HAS_POLES) {
@@ -3536,6 +3537,7 @@
     tile_set_continent(ptile, 0);
     BV_CLR_ALL(ptile->extras);
     tile_set_owner(ptile, NULL, NULL);
+    ptile->extras_owner = NULL;
   } whole_map_iterate_end;
 
   i = 0;


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

Reply via email to