Author: pepeto
Date: Mon Jan 12 14:38:02 2015
New Revision: 27634

URL: http://svn.gna.org/viewcvs/freeciv?rev=27634&view=rev
Log:
Client: make city selection possible even if borders are disabled in game rules.

Reported anonymously

See gna bug #23058

Modified:
    trunk/client/mapctrl_common.c

Modified: trunk/client/mapctrl_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/mapctrl_common.c?rev=27634&r1=27633&r2=27634&view=diff
==============================================================================
--- trunk/client/mapctrl_common.c       (original)
+++ trunk/client/mapctrl_common.c       Mon Jan 12 14:38:02 2015
@@ -122,7 +122,7 @@
   int x, y, xx, yy;
   float x2, y2;
   struct unit_list *units = unit_list_new();
-
+  const struct city *pcity;
   bool found_any_cities = FALSE;
 
   if (!append) {
@@ -157,8 +157,8 @@
 
       /*  Tile passed all tests; process it.
        */
-      if (NULL != tile_city(ptile)
-          && tile_owner(ptile) == client.conn.playing) {
+      pcity = tile_city(ptile);
+      if (pcity != NULL && city_owner(pcity) == client_player()) {
         mapdeco_set_highlight(ptile, TRUE);
         found_any_cities = tiles_hilited_cities = TRUE;
       }


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

Reply via email to