Author: cazfi
Date: Tue Dec 8 11:43:43 2015
New Revision: 30881
URL: http://svn.gna.org/viewcvs/freeciv?rev=30881&view=rev
Log:
Thaw city_freeze_workers_queue() after handling of each player in end_phase().
See bug #24146
Modified:
branches/S2_6/server/sanitycheck.c
branches/S2_6/server/srv_main.c
Modified: branches/S2_6/server/sanitycheck.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/sanitycheck.c?rev=30881&r1=30880&r2=30881&view=diff
==============================================================================
--- branches/S2_6/server/sanitycheck.c (original)
+++ branches/S2_6/server/sanitycheck.c Tue Dec 8 11:43:43 2015
@@ -320,6 +320,7 @@
sum += pcity->feel[ccategory][feel];
}
+ SANITY_CITY(pcity, pcity->server.workers_frozen == 0);
SANITY_CITY(pcity, city_size_get(pcity) - spe == sum);
}
}
Modified: branches/S2_6/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=30881&r1=30880&r2=30881&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Tue Dec 8 11:43:43 2015
@@ -1189,6 +1189,7 @@
}
update_city_activities(pplayer);
+ city_thaw_workers_queue();
pplayer->culture += nation_history_gain(pplayer);
research_get(pplayer)->researching_saved = A_UNKNOWN;
/* reduce the number of bulbs by the amount needed for tech upkeep and
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
