Author: cazfi
Date: Tue Dec  8 11:43:37 2015
New Revision: 30880

URL: http://svn.gna.org/viewcvs/freeciv?rev=30880&view=rev
Log:
Thaw city_freeze_workers_queue() after handling of each player in end_phase().

See bug #24146

Modified:
    trunk/server/sanitycheck.c
    trunk/server/srv_main.c

Modified: trunk/server/sanitycheck.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/sanitycheck.c?rev=30880&r1=30879&r2=30880&view=diff
==============================================================================
--- trunk/server/sanitycheck.c  (original)
+++ trunk/server/sanitycheck.c  Tue Dec  8 11:43:37 2015
@@ -353,6 +353,7 @@
       sum += pcity->feel[ccategory][feel];
     }
 
+    SANITY_CITY(pcity, pcity->server.workers_frozen == 0);
     SANITY_CITY(pcity, city_size_get(pcity) - spe == sum);
   }
 }

Modified: trunk/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=30880&r1=30879&r2=30880&view=diff
==============================================================================
--- trunk/server/srv_main.c     (original)
+++ trunk/server/srv_main.c     Tue Dec  8 11:43:37 2015
@@ -1220,6 +1220,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

Reply via email to