Author: cazfi
Date: Sun Oct 25 10:06:03 2015
New Revision: 30208
URL: http://svn.gna.org/viewcvs/freeciv?rev=30208&view=rev
Log:
Do not refresh cities during savegame loading when tradepartner has not
necessarily beed loaded yet.
See bug #23614
Modified:
branches/S2_6/server/savegame2.c
Modified: branches/S2_6/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame2.c?rev=30208&r1=30207&r2=30208&view=diff
==============================================================================
--- branches/S2_6/server/savegame2.c (original)
+++ branches/S2_6/server/savegame2.c Sun Oct 25 10:06:03 2015
@@ -3812,9 +3812,13 @@
/* Update all city information. This must come after all cities are
* 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);
- } cities_iterate_end;
+ players_iterate(plr) {
+ city_list_iterate(plr->cities, pcity) {
+ city_refresh(pcity);
+ sanity_check_city(pcity);
+ CALL_PLR_AI_FUNC(city_got, plr, plr, pcity);
+ } city_list_iterate_end;
+ } players_iterate_end;
/* Since the cities must be placed on the map to put them on the
player map we do this afterwards */
@@ -4675,12 +4679,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);
}
@@ -4729,13 +4727,6 @@
tasks_handled = TRUE;
}
}
-
- /* Check the sanity of the cities. */
- city_list_iterate(plr->cities, pcity) {
- city_refresh(pcity);
- sanity_check_city(pcity);
- CALL_PLR_AI_FUNC(city_got, plr, plr, pcity);
- } city_list_iterate_end;
}
/****************************************************************************
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
