Author: cazfi
Date: Thu Nov 12 22:34:58 2015
New Revision: 30578
URL: http://svn.gna.org/viewcvs/freeciv?rev=30578&view=rev
Log:
Do not refresh cities during savegame.c savegame loading when tradepartner has
not necessarily been loaded yet.
See bug #23614
Modified:
branches/S2_5/server/savegame.c
Modified: branches/S2_5/server/savegame.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/savegame.c?rev=30578&r1=30577&r2=30578&view=diff
==============================================================================
--- branches/S2_5/server/savegame.c (original)
+++ branches/S2_5/server/savegame.c Thu Nov 12 22:34:58 2015
@@ -2902,12 +2902,6 @@
vision_reveal_tiles(pcity->server.vision, game.server.vision_reveal_tiles);
city_refresh_vision(pcity);
- /* Refresh the city. This also checks the squared city radius. Thus, it
- * must be after improvements, as the effect City_Radius_SQ could be
- * influenced by improvements; and after the vision is defined, as the
- * function calls city_refresh_vision(). */
- city_refresh(pcity);
-
city_list_append(plr->cities, pcity);
}
}
@@ -4345,7 +4339,7 @@
* loaded (in player_load) but before player (dumb) cities are loaded
* in player_load_vision(). */
cities_iterate(pcity) {
- city_refresh_from_main_map(pcity, NULL);
+ city_refresh(pcity);
} cities_iterate_end;
/* Since the cities must be placed on the map to put them on the
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
