Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.130
diff -u -r1.130 citydlg.c
--- client/gui-gtk/citydlg.c	2002/03/06 14:01:18	1.130
+++ client/gui-gtk/citydlg.c	2002/03/06 14:05:52
@@ -3208,7 +3208,7 @@
   id = (int) gtk_clist_get_row_data(GTK_CLIST
 				    (pdialog->overview.improvement_list),
 				    (int) selection->data);
-  assert(pdialog->pcity->improvements[id]);
+  assert(city_got_building(pdialog->pcity, id));
   if (is_wonder(id))
     return;
 
@@ -3286,7 +3286,7 @@
 					  (pdialog->overview.
 					   improvement_list),
 					  (int) selection->data);
-    assert(pdialog->pcity->improvements[id]);
+    assert(city_got_building(pdialog->pcity, id));
 
     if (!is_wonder(id)) {
       char buf[64];
Index: client/gui-gtk/gotodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/gotodlg.c,v
retrieving revision 1.17
diff -u -r1.17 gotodlg.c
--- client/gui-gtk/gotodlg.c	2002/02/11 10:37:50	1.17
+++ client/gui-gtk/gotodlg.c	2002/03/06 14:05:52
@@ -199,7 +199,7 @@
     if(!all_cities && i!=game.player_idx) continue;
     city_list_iterate(game.players[i].cities, pcity) {
       sz_strlcpy(name, pcity->name);
-      if(pcity->improvements[B_AIRPORT]==1)
+      if (pcity->improvements[B_AIRPORT] == I_ACTIVE)
 	sz_strlcat(name, "(A)");
       gtk_clist_append( GTK_CLIST( goto_list ), row );
     }
Index: client/gui-mui/gotodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/gotodlg.c,v
retrieving revision 1.9
diff -u -r1.9 gotodlg.c
--- client/gui-mui/gotodlg.c	2001/08/05 14:44:58	1.9
+++ client/gui-mui/gotodlg.c	2002/03/06 14:05:53
@@ -58,7 +58,7 @@
 {
   static char name[80];
   sz_strlcpy(name, pcity->name);
-  if (pcity->improvements[B_AIRPORT] == 1)
+  if (pcity->improvements[B_AIRPORT] == I_ACTIVE)
     sz_strlcat(name, "(A)");
   *array = name;
 }
Index: client/gui-win32/gotodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/gotodlg.c,v
retrieving revision 1.2
diff -u -r1.2 gotodlg.c
--- client/gui-win32/gotodlg.c	2001/09/15 18:35:56	1.2
+++ client/gui-win32/gotodlg.c	2002/03/06 14:05:53
@@ -186,7 +186,7 @@
     if(!show_all_cities && i!=game.player_idx) continue;
     city_list_iterate(game.players[i].cities, pcity) {
       sz_strlcpy(name, pcity->name);
-      if(pcity->improvements[B_AIRPORT]==1)
+      if (pcity->improvements[B_AIRPORT] == I_ACTIVE)
         sz_strlcat(name, "(A)");
       j=ListBox_AddString(list,name);
       ListBox_SetItemData(list,j,pcity->id);
Index: client/gui-xaw/gotodlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/gotodlg.c,v
retrieving revision 1.17
diff -u -r1.17 gotodlg.c
--- client/gui-xaw/gotodlg.c	2001/06/23 20:33:37	1.17
+++ client/gui-xaw/gotodlg.c	2002/03/06 14:05:53
@@ -222,7 +222,7 @@
     city_list_iterate(game.players[i].cities, pcity) {
       char name[MAX_LEN_NAME+3];
       sz_strlcpy(name, pcity->name);
-      if(pcity->improvements[B_AIRPORT]==1)
+      if (pcity->improvements[B_AIRPORT] == I_ACTIVE)
 	sz_strlcat(name, "(A)");
       city_name_ptrs[j++]=mystrdup(name);
     }