[Freeciv-Dev] (PR#2489) angry citizens aren't shown

["Jason Short via RT" <rt@xxxxxxxxxxxxxx>]

In gui-gtk and gui-gtk-2.0, the main panel of the city dialog window
will not show angry citizens.  Aside from the fact that angry citizens
are very rare, this is easily reproducable.

A simple fix for this, is, well, simple.  A patch is attached.  This
should also be applied to 1.14.

A more long-term solution would provide common code to do the work here.

jason


? client/foo.c
Index: client//gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.146
diff -u -r1.146 citydlg.c
--- client//gui-gtk/citydlg.c   2002/11/17 02:21:11     1.146
+++ client//gui-gtk/citydlg.c   2002/12/05 04:55:10
@@ -1684,6 +1684,11 @@
                       get_citizen_sprite(7 + i % 2), i * width, 0, TRUE);
   }
 
+  for (n = 0; n < pcity->ppl_angry[4]; n++, i++) {
+    gtk_pixcomm_copyto(GTK_PIXCOMM(pdialog->citizen_pixmap),
+                      get_citizen_sprite(9 + i % 2), i * width, 0, TRUE);
+  }
+
   pdialog->first_elvis = i;
   for (n = 0; n < pcity->ppl_elvis; n++, i++) {
     gtk_pixcomm_copyto(GTK_PIXCOMM(pdialog->citizen_pixmap),
Index: client//gui-gtk-2.0/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/citydlg.c,v
retrieving revision 1.15
diff -u -r1.15 citydlg.c
--- client//gui-gtk-2.0/citydlg.c       2002/11/30 20:06:49     1.15
+++ client//gui-gtk-2.0/citydlg.c       2002/12/05 04:55:11
@@ -1670,6 +1670,11 @@
                       get_citizen_sprite(7 + i % 2), i * width, 0);
   }
 
+  for (n = 0; n < pcity->ppl_angry[4]; n++, i++) {
+    gtk_pixcomm_copyto(GTK_PIXCOMM(pdialog->citizen_pixmap),
+                      get_citizen_sprite(9 + i % 2), i * width, 0);
+  }
+
   pdialog->first_elvis = i;
   for (n = 0; n < pcity->ppl_elvis; n++, i++) {
     gtk_pixcomm_copyto(GTK_PIXCOMM(pdialog->citizen_pixmap),