Author: cazfi
Date: Sun Jun 26 16:39:32 2016
New Revision: 33036
URL: http://svn.gna.org/viewcvs/freeciv?rev=33036&view=rev
Log:
Corrected global observers not to see whole map as part of a city map
Reported by GriffonSpade
See bug #24791
Modified:
trunk/client/tilespec.c
trunk/common/player.c
Modified: trunk/client/tilespec.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=33036&r1=33035&r2=33036&view=diff
==============================================================================
--- trunk/client/tilespec.c (original)
+++ trunk/client/tilespec.c Sun Jun 26 16:39:32 2016
@@ -4968,8 +4968,7 @@
city[i] = (tile
&& (NULL == powner || NULL == client.conn.playing
|| powner == client.conn.playing)
- && (NULL == client.conn.playing
- || player_in_city_map(client.conn.playing, tile)));
+ && player_in_city_map(client.conn.playing, tile));
if (city[i]) {
if (citymode) {
/* In citymode, we only draw worked tiles for this city - other
Modified: trunk/common/player.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/player.c?rev=33036&r1=33035&r2=33036&view=diff
==============================================================================
--- trunk/common/player.c (original)
+++ trunk/common/player.c Sun Jun 26 16:39:32 2016
@@ -1100,7 +1100,8 @@
city_tile_iterate(CITY_MAP_MAX_RADIUS_SQ, ptile, ptile1) {
struct city *pcity = tile_city(ptile1);
- if (pcity && city_owner(pcity) == pplayer
+ if (pcity
+ && (pplayer == NULL || city_owner(pcity) == pplayer)
&& city_map_radius_sq_get(pcity) >= sq_map_distance(ptile,
ptile1)) {
return TRUE;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
