Author: cazfi Date: Thu Nov 12 22:34:52 2015 New Revision: 30577 URL: http://svn.gna.org/viewcvs/freeciv?rev=30577&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_6/server/savegame.c Modified: branches/S2_6/server/savegame.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/savegame.c?rev=30577&r1=30576&r2=30577&view=diff ============================================================================== --- branches/S2_6/server/savegame.c (original) +++ branches/S2_6/server/savegame.c Thu Nov 12 22:34:52 2015 @@ -2617,15 +2617,7 @@ 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); - - CALL_PLR_AI_FUNC(city_got, plr, plr, pcity); } } @@ -4078,9 +4070,12 @@ /* 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); + 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 */ _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits