[Freeciv-Dev] (PR#3472) City dialog doesn't show net production

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

[guest - Wed Feb 19 03:32:56 2003]:

> The city dialog no longer shows the net production.  If a city is
> producing 4 shields, and two are being used to support units, the
> production is shown as Prod: 4 (+4), where it should be Prod: 4 (+2).
> 
> Feb 16 cvs, gtk2 client.

This came as a result of the waste patch...

GTK and GTK2 clients are affected.

I don't see anything wrong with the food surplus, though.

jason

Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.158
diff -u -r1.158 citydlg.c
--- client/gui-gtk/citydlg.c    2003/02/15 07:23:47     1.158
+++ client/gui-gtk/citydlg.c    2003/02/21 20:15:25
@@ -1695,7 +1695,8 @@
   my_snprintf(buf[FOOD], sizeof(buf[FOOD]), "%2d (%+2d)",
              pcity->food_prod, pcity->food_surplus);
   my_snprintf(buf[SHIELD], sizeof(buf[SHIELD]), "%2d (%+2d)",
-             pcity->shield_prod + pcity->shield_waste, pcity->shield_prod);
+             pcity->shield_prod + pcity->shield_waste,
+             pcity->shield_surplus);
   my_snprintf(buf[TRADE], sizeof(buf[TRADE]), "%2d (%+2d)",
              pcity->trade_prod + pcity->corruption, pcity->trade_prod);
   my_snprintf(buf[GOLD], sizeof(buf[GOLD]), "%2d (%+2d)",
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.30
diff -u -r1.30 citydlg.c
--- client/gui-gtk-2.0/citydlg.c        2003/02/15 07:23:47     1.30
+++ client/gui-gtk-2.0/citydlg.c        2003/02/21 20:15:27
@@ -1678,7 +1678,8 @@
   my_snprintf(buf[FOOD], sizeof(buf[FOOD]), "%2d (%+2d)",
              pcity->food_prod, pcity->food_surplus);
   my_snprintf(buf[SHIELD], sizeof(buf[SHIELD]), "%2d (%+2d)",
-             pcity->shield_prod + pcity->shield_waste, pcity->shield_prod);
+             pcity->shield_prod + pcity->shield_waste,
+             pcity->shield_surplus);
   my_snprintf(buf[TRADE], sizeof(buf[TRADE]), "%2d (%+2d)",
              pcity->trade_prod + pcity->corruption, pcity->trade_prod);
   my_snprintf(buf[GOLD], sizeof(buf[GOLD]), "%2d (%+2d)",