Author: cazfi Date: Fri Dec 18 20:51:31 2015 New Revision: 31071 URL: http://svn.gna.org/viewcvs/freeciv?rev=31071&view=rev Log: Load player research before main player data from the savegame to fix problems with seemingly unknown technologies.
Reported by Jordi Negrevernis i Font <jorneg> See bug #24133 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=31071&r1=31070&r2=31071&view=diff ============================================================================== --- branches/S2_6/server/savegame2.c (original) +++ branches/S2_6/server/savegame2.c Fri Dec 18 20:51:31 2015 @@ -567,10 +567,10 @@ sg_load_players_basic(loading); /* [map]; needs width and height loaded by [settings] */ sg_load_map(loading); + /* [research] */ + sg_load_researches(loading); /* [player<i>] */ sg_load_players(loading); - /* [research] */ - sg_load_researches(loading); /* [event_cache] */ sg_load_event_cache(loading); /* [treaties] */ @@ -3930,6 +3930,8 @@ unit_list_iterate(pplayer->units, punit) { if (!can_unit_continue_current_activity(punit)) { log_sg("Unit doing illegal activity in savegame!"); + log_sg("Activity: %s, Target: %s", unit_activity_name(punit->activity), + extra_rule_name(punit->activity_target)); punit->activity = ACTIVITY_IDLE; } } unit_list_iterate_end; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits