? autom4te-2.53.cache
Index: client/mapctrl_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/mapctrl_common.c,v
retrieving revision 1.19
diff -u -r1.19 mapctrl_common.c
--- client/mapctrl_common.c	2003/11/14 12:26:56	1.19
+++ client/mapctrl_common.c	2003/11/14 14:41:58
@@ -136,7 +136,7 @@
       ptile = map_get_tile(tile_x, tile_y);
       pcity = ptile->city;
       if (pcity && pcity->owner == game.player_idx) {
-        ptile->hilite = HILITE_CITY;
+        ptile->client.hilite = HILITE_CITY;
         tiles_hilited_cities = TRUE;
       }
     }
@@ -231,7 +231,7 @@
     tiles_hilited_cities = FALSE;
 
     whole_map_iterate(x, y) {
-      map_get_tile(x, y)->hilite = HILITE_NONE;
+      map_get_tile(x, y)->client.hilite = HILITE_NONE;
     } whole_map_iterate_end;
 
     update_map_canvas_visible();
@@ -262,13 +262,13 @@
   struct tile *ptile = map_get_tile(tile_x, tile_y);
   struct city *pcity = ptile->city;
 
-  if (ptile->hilite == HILITE_CITY) {
+  if (ptile->client.hilite == HILITE_CITY) {
     assert(pcity);
     toggle_city_hilite(pcity, FALSE); /* cityrep.c */
-    ptile->hilite = HILITE_NONE;
+    ptile->client.hilite = HILITE_NONE;
   }
   else if (pcity && pcity->owner == game.player_idx) {
-    ptile->hilite = HILITE_CITY;
+    ptile->client.hilite = HILITE_CITY;
     tiles_hilited_cities = TRUE;
     toggle_city_hilite(pcity, TRUE);
   }
@@ -340,7 +340,7 @@
   else {
     connection_do_buffer(&aconnection);
     city_list_iterate(game.player_ptr->cities, pcity) {
-      if (map_get_tile(pcity->x, pcity->y)->hilite == HILITE_CITY) {
+      if (map_get_tile(pcity->x, pcity->y)->client.hilite == HILITE_CITY) {
         clipboard_send_production_packet(pcity);
       }
     } city_list_iterate_end;
@@ -354,15 +354,10 @@
 static void clipboard_send_production_packet(struct city *pcity)
 {
   struct packet_city_request packet;
-  int cid = clipboard;
+  cid mycid = cid_encode(clipboard_is_unit, clipboard);
 
-  if (clipboard_is_unit)  {
-    cid += B_LAST;
-  }
-
-  if ((pcity->currently_building == clipboard
-    && pcity->is_building_unit == clipboard_is_unit)
-      || !city_can_build_impr_or_unit(pcity, cid))  {
+  if (mycid == cid_encode_from_city(pcity)
+      || !city_can_build_impr_or_unit(pcity, mycid)) {
     return;
   }
 
Index: client/mapview_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/mapview_common.c,v
retrieving revision 1.69
diff -u -r1.69 mapview_common.c
--- client/mapview_common.c	2003/11/14 12:26:56	1.69
+++ client/mapview_common.c	2003/11/14 14:42:05
@@ -733,7 +733,8 @@
     }
 
     /** Area Selection hiliting **/
-    if (!citymode && map_get_tile(map_x, map_y)->hilite == HILITE_CITY) {
+    if (!citymode &&
+        map_get_tile(map_x, map_y)->client.hilite == HILITE_CITY) {
       const enum color_std hilitecolor = COLOR_STD_YELLOW;
 
       if (!draw_map_grid) { /* it would be overwritten below */
Index: client/gui-gtk/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cityrep.c,v
retrieving revision 1.81
diff -u -r1.81 cityrep.c
--- client/gui-gtk/cityrep.c	2003/11/14 12:26:56	1.81
+++ client/gui-gtk/cityrep.c	2003/11/14 14:42:11
@@ -1355,7 +1355,7 @@
   {
     struct city *pcity = gtk_clist_get_row_data(GTK_CLIST(city_list), i);
 
-    if (map_get_tile(pcity->x, pcity->y)->hilite == HILITE_CITY) {
+    if (map_get_tile(pcity->x, pcity->y)->client.hilite == HILITE_CITY) {
       gtk_clist_select_row(GTK_CLIST(city_list), i, 0);
     }
   }
Index: client/gui-gtk/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/mapview.c,v
retrieving revision 1.184
diff -u -r1.184 mapview.c
--- client/gui-gtk/mapview.c	2003/11/14 12:26:56	1.184
+++ client/gui-gtk/mapview.c	2003/11/14 14:42:19
@@ -1507,7 +1507,7 @@
   punit = get_drawable_unit(x, y, citymode);
   pfocus = get_unit_in_focus();
   special = map_get_special(x, y);
-  tile_hilited = (map_get_tile(x,y)->hilite != HILITE_NONE);
+  tile_hilited = (map_get_tile(x,y)->client.hilite != HILITE_NONE);
 
   if (solid_bg) {
     gdk_gc_set_clip_origin(fill_bg_gc, canvas_x, canvas_y);
Index: client/gui-gtk-2.0/cityrep.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/cityrep.c,v
retrieving revision 1.51
diff -u -r1.51 cityrep.c
--- client/gui-gtk-2.0/cityrep.c	2003/11/14 12:26:56	1.51
+++ client/gui-gtk-2.0/cityrep.c	2003/11/14 14:42:26
@@ -1723,7 +1723,7 @@
     itree_get(&it, 0, &res, -1);
     pcity = res;
 
-    if (map_get_tile(pcity->x, pcity->y)->hilite == HILITE_CITY)  {
+    if (map_get_tile(pcity->x, pcity->y)->client.hilite == HILITE_CITY)  {
       itree_select(city_selection, &it);
     }
   }
Index: client/gui-gtk-2.0/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/mapview.c,v
retrieving revision 1.81
diff -u -r1.81 mapview.c
--- client/gui-gtk-2.0/mapview.c	2003/11/14 12:26:57	1.81
+++ client/gui-gtk-2.0/mapview.c	2003/11/14 14:42:33
@@ -1579,7 +1579,7 @@
   punit = get_drawable_unit(x, y, citymode);
   pfocus = get_unit_in_focus();
   special = map_get_special(x, y);
-  tile_hilited = (map_get_tile(x,y)->hilite != HILITE_NONE);
+  tile_hilited = (map_get_tile(x,y)->client.hilite != HILITE_NONE);
 
   if (solid_bg) {
     gdk_gc_set_clip_origin(fill_bg_gc, canvas_x, canvas_y);
Index: common/map.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/map.c,v
retrieving revision 1.150
diff -u -r1.150 map.c
--- common/map.c	2003/11/14 12:26:58	1.150
+++ common/map.c	2003/11/14 14:42:41
@@ -215,7 +215,9 @@
   ptile->worked   = NULL; /* pointer to city working tile */
   ptile->assigned = 0; /* bitvector */
   ptile->owner    = NULL; /* Tile not claimed by any nation. */
-  ptile->hilite   = HILITE_NONE; /* Area Selection. Client. */
+  if (!is_server) {
+    ptile->client.hilite = HILITE_NONE; /* Area Selection in client. */
+  }
 }
 
 /**************************************************************************
Index: common/map.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/map.h,v
retrieving revision 1.163
diff -u -r1.163 map.h
--- common/map.h	2003/11/14 12:26:58	1.163
+++ common/map.h	2003/11/14 14:42:44
@@ -65,7 +65,10 @@
   unsigned short continent;
   signed char move_cost[8]; /* don't know if this helps! */
   struct player *owner;     /* Player owning this tile, or NULL. */
-  enum tile_hilite hilite;  /* Area Selection. Client only. */
+  struct {
+    /* Area Selection in client. */
+    enum tile_hilite hilite;
+  } client;
 };