? diff
? data/script
Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.193
diff -u -r1.193 packhand.c
--- client/packhand.c	2001/10/03 09:16:54	1.193
+++ client/packhand.c	2001/10/05 13:16:26
@@ -343,6 +343,7 @@
   pcity->shield_prod=packet->shield_prod;
   pcity->shield_surplus=packet->shield_surplus;
   pcity->trade_prod=packet->trade_prod;
+  pcity->tile_trade=packet->tile_trade;
   pcity->corruption=packet->corruption;
   
   pcity->luxury_total=packet->luxury_total;
@@ -591,6 +592,7 @@
     pcity->shield_prod        = 0;
     pcity->shield_surplus     = 0;
     pcity->trade_prod         = 0;
+    pcity->tile_trade         = 0;
     pcity->corruption         = 0;
     pcity->luxury_total       = 0;
     pcity->tax_total          = 0;
Index: common/capstr.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v
retrieving revision 1.87
diff -u -r1.87 capstr.c
--- common/capstr.c	2001/09/25 19:58:12	1.87
+++ common/capstr.c	2001/10/05 13:16:27
@@ -71,7 +71,7 @@
  */
 
 #define CAPABILITY "+1.11.6 conn_info pop_cost turn attributes new_bonus_tech"\
-" fund_added processing_packets angrycitizen"
+" fund_added processing_packets angrycitizen tile_trade"
   
 /* "+1.11.6" is protocol for 1.11.6 beta release.
   
@@ -98,6 +98,8 @@
    civilization II.  They counts as 2 unhappy citizens, they are saved
    in ppl_angry[], and you must dealt with them before any citizens in
    a city can become unhappy.
+   
+   "tile_trade" sends the tile_trade field from struct city.
 */
 
 void init_our_capability(void)
Index: common/packets.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v
retrieving revision 1.163
diff -u -r1.163 packets.c
--- common/packets.c	2001/09/19 20:59:24	1.163
+++ common/packets.c	2001/10/05 13:16:29
@@ -2258,6 +2258,9 @@
   cptr=put_uint16(cptr, req->shield_prod);
   cptr=put_uint16(cptr, req->shield_surplus);
   cptr=put_uint16(cptr, req->trade_prod);
+  if (pc && has_capability("tile_trade", pc->capability)) {
+      cptr=put_uint16(cptr, req->tile_trade);
+  }
   cptr=put_uint16(cptr, req->corruption);
 
   cptr=put_uint16(cptr, req->luxury_total);
@@ -2346,6 +2349,11 @@
   iget_uint16(&iter, &packet->shield_surplus);
   if(packet->shield_surplus > 32767) packet->shield_surplus-=65536;
   iget_uint16(&iter, &packet->trade_prod);
+  if (pc && has_capability("tile_trade", pc->capability)) {
+    iget_uint16(&iter, &packet->tile_trade);
+  } else {
+    packet->tile_trade = 0;
+  }
   iget_uint16(&iter, &packet->corruption);
 
   iget_uint16(&iter, &packet->luxury_total);
Index: common/packets.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.h,v
retrieving revision 1.95
diff -u -r1.95 packets.h
--- common/packets.h	2001/09/16 12:43:27	1.95
+++ common/packets.h	2001/10/05 13:16:30
@@ -336,7 +336,7 @@
   int ppl_elvis, ppl_scientist, ppl_taxman;
   int food_prod, food_surplus;
   int shield_prod, shield_surplus;
-  int trade_prod, corruption;
+  int trade_prod, tile_trade, corruption;
   int trade[4],trade_value[4];
   int luxury_total, tax_total, science_total;
 
Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.145
diff -u -r1.145 citytools.c
--- server/citytools.c	2001/10/04 20:23:36	1.145
+++ server/citytools.c	2001/10/05 13:16:31
@@ -1418,6 +1418,7 @@
   packet->shield_prod=pcity->shield_prod;
   packet->shield_surplus=pcity->shield_surplus;
   packet->trade_prod=pcity->trade_prod;
+  packet->tile_trade=pcity->tile_trade;
   packet->corruption=pcity->corruption;
   
   packet->luxury_total=pcity->luxury_total;