? rc
? part
? diff
? msgfmt1.diff
? map_adjust.diff
? n869.txt
? err
? short_worklists2.diff
? tech_cost_style17.diff
? tmp_diff
? reqs.html
? tech_cost_style16.diff
? diff2
? tilespec.diff
? local_warmap131201.diff
? gran.diff
? unit_move_turns1.diff
? granary1.diff
? short_worklists1.diff
? sound4.patch
? data/diff
? intl/msgfmt.c
Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.168
diff -u -r1.168 cityturn.c
--- server/cityturn.c	2001/12/21 16:26:41	1.168
+++ server/cityturn.c	2002/01/06 18:27:20
@@ -431,6 +431,11 @@
     return;
   }
   pcity->size -= pop_loss;
+
+  if (pcity->food_stock > city_granary_size(pcity->size)) {
+    pcity->food_stock = city_granary_size(pcity->size);
+  }
+
   while (pop_loss > 0 && city_specialists(pcity)) {
     if(pcity->ppl_taxman) {
       pcity->ppl_taxman--;
@@ -447,7 +452,6 @@
   if (pop_loss == 0) {
     city_refresh(pcity);
     send_city_info(city_owner(pcity), pcity);
-    return;
   } else {
     auto_arrange_workers(pcity);
     sync_cities();