[Freeciv-Dev] (PR#3763) (win32) upkeep in citydlg with adam smith's

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

The attached patch should fix PR#3688 for gui-win32.  It is untested. 
It probably also applies to the 1_14 branch.

jason

? client/annotate
Index: client/gui-win32/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/citydlg.c,v
retrieving revision 1.51
diff -u -r1.51 citydlg.c
--- client/gui-win32/citydlg.c  2003/02/27 00:31:10     1.51
+++ client/gui-win32/citydlg.c  2003/03/21 23:41:56
@@ -266,12 +266,14 @@
     strings[0] = items[item].descr;
     strings[1] = buf;
 
-    my_snprintf(buf, sizeof(buf), "%d", get_improvement_type(id)->upkeep);
+    /* This takes effects (like Adam Smith's) into account. */
+    my_snprintf(buf, sizeof(buf), "%d",
+               improvement_upkeep(pdialog->pcity, id));
    
     row=fcwin_listview_add_row(pdialog->buildings_list,
                           item, 2, strings);
     pdialog->building_cids[row]=items[item].cid;
-    total += get_improvement_type(id)->upkeep;
+    total += improvement_upkeep(pdialog->pcity, id);
   }
   lvc.mask=LVCF_TEXT;
   lvc.pszText=buf;