Index: city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.126
diff -u -r1.126 city.c
--- city.c	2001/10/04 20:23:35	1.126
+++ city.c	2001/10/11 19:06:38
@@ -1898,6 +1902,18 @@
 **************************************************************************/
 void generic_city_refresh(struct city *pcity)
 {
+  if (pcity->was_happy) {
+    pcity->ppl_happy[4] = pcity->size;
+    pcity->ppl_content[4] = 0;
+    pcity->ppl_unhappy[4] = 0;
+    pcity->ppl_angry[4] = 0;
+  } else {
+    pcity->ppl_happy[4] = 0;
+    pcity->ppl_content[4] = 0;
+    pcity->ppl_unhappy[4] = pcity->size;
+    pcity->ppl_angry[4] = 0;
+  }
+
   set_food_trade_shields(pcity);
   citizen_happy_size(pcity);
   set_tax_income(pcity);	/* calc base luxury, tax & bulbs */