[Freeciv-Dev] Re: (PR#3688) Upkeep in Citywindow with Adam Smith's

["ue80@xxxxxxxxxxxxxxxxxxxxx" <ue80@xxxxxxxxxxxxxxxxxxxxx>]

On Mon, Mar 10, 2003 at 07:43:41AM -0800, ue80@xxxxxxxxxxxxxxxxxxxxx wrote:
> 
> Hi,
> 
> the upkeep in the citywindow doesn't care about if we have a wonder
> which "pays" for all buildings with cost 1.

and here the patch for gui-gtk and gui-gtk2.0 (last not tested)

Thomas
-- 
Thomas Strub  ***  eMail ue80@xxxxxxxxxxxxxxxxxxxxx
Wenn Du nicht programmieren kannst und Dir für Arbeit zu schade bist:
Werde Berater, Analyst oder organisiere Kongresse.

Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.161
diff -u -r1.161 citydlg.c
--- client/gui-gtk/citydlg.c    2003/03/02 18:41:11     1.161
+++ client/gui-gtk/citydlg.c    2003/03/10 20:10:05
@@ -1976,14 +1976,14 @@
     strings[0] = items[item].descr;
     strings[1] = buf;
 
-    my_snprintf(buf, sizeof(buf), "%d", get_improvement_type(id)->upkeep);
+    my_snprintf(buf, sizeof(buf), "%d", improvement_upkeep(pdialog->pcity, 
id));
 
     row = gtk_clist_append(GTK_CLIST(pdialog->overview.improvement_list),
                           strings);
     gtk_clist_set_row_data(GTK_CLIST(pdialog->overview.improvement_list),
                           row, GINT_TO_POINTER(id));
 
-    total += get_improvement_type(id)->upkeep;
+    total += improvement_upkeep(pdialog->pcity, id);
   }
   gtk_clist_thaw(GTK_CLIST(pdialog->overview.improvement_list));
 
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.35
diff -u -r1.35 citydlg.c
--- client/gui-gtk-2.0/citydlg.c        2003/03/07 01:07:22     1.35
+++ client/gui-gtk-2.0/citydlg.c        2003/03/10 20:10:08
@@ -1962,14 +1962,14 @@
     strings[0] = items[item].descr;
     strings[1] = buf;
 
-    my_snprintf(buf, sizeof(buf), "%d", get_improvement_type(id)->upkeep);
+    my_snprintf(buf, sizeof(buf), "%d", improvement_upkeep(pdialog->pcity, 
id));
 
     row = gtk_clist_append(GTK_CLIST(pdialog->overview.improvement_list),
                           strings);
     gtk_clist_set_row_data(GTK_CLIST(pdialog->overview.improvement_list),
                           row, GINT_TO_POINTER(id));
 
-    total += get_improvement_type(id)->upkeep;
+    total += improvement_upkeep(pdialog->pcity, id);
   }
   gtk_clist_thaw(GTK_CLIST(pdialog->overview.improvement_list));