Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.246
diff -u -r1.246 packhand.c
--- client/packhand.c	2002/07/10 14:20:27	1.246
+++ client/packhand.c	2002/07/11 08:20:55
@@ -62,7 +62,6 @@
 #include "tilespec.h"
 #include "wldlg_g.h"
 #include "attribute.h"
-#include "capability.h"
 #include "agents.h"
 #include "audio.h"
 
@@ -655,8 +654,7 @@
   /*
    * The turn was increased in handle_before_new_year()
    */
-  assert(game.turn == ppacket->turn
-	 || !has_capability("turn", aconnection.capability));
+  assert(game.turn == ppacket->turn);
   update_info_label();
 
   player_set_unit_focus_status(game.player_ptr);
@@ -695,8 +693,7 @@
    * which is incorrect. If we get the authoritative information about
    * the game turn in handle_new_year() we will check it.
    */
-  if (has_capability("turn", aconnection.capability))
-    game.turn++;
+  game.turn++;
   agents_before_new_turn();
 }
 
@@ -2161,13 +2158,8 @@
   game.rgame.nuke_contamination = packet->nuke_contamination;
   game.rgame.granary_food_ini = packet->granary_food_ini;
   game.rgame.granary_food_inc = packet->granary_food_inc;
-  if(has_capability("tech_cost_style", aconnection.capability)) {
-    game.rgame.tech_cost_style = packet->tech_cost_style;
-    game.rgame.tech_leakage = packet->tech_leakage;
-  } else {
-    game.rgame.tech_cost_style = 0;
-    game.rgame.tech_leakage = 0;
-  }
+  game.rgame.tech_cost_style = packet->tech_cost_style;
+  game.rgame.tech_leakage = packet->tech_leakage;
 }
 
 /**************************************************************************
Index: common/capstr.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v
retrieving revision 1.101
diff -u -r1.101 capstr.c
--- common/capstr.c	2002/05/07 07:40:53	1.101
+++ common/capstr.c	2002/07/11 08:20:55
@@ -70,66 +70,12 @@
  * are not directly related to the capability strings discussed here.)
  */
 
-#define CAPABILITY "+1.11.6 conn_info pop_cost +turn +attributes"\
-" new_bonus_tech fund_added +processing_packets angrycitizen +tile_trade"\
-" init_techs short_worklists tech_cost_style +short_city_tile_trade"\
-" +trade_size +new_nation_selection +client_worklists sound u32timeout" \
-" +notifies"
+#define CAPABILITY "+1.13.0 conn_info"
   
-/* "+1.11.6" is protocol for 1.11.6 beta release.
+/* "+1.13.0" is protocol for 1.13.0 release.
   
    "conn_info" is sending the conn_id field. To preserve compatability
    with old clients trying to connect this should persist across releases.
-
-   "pop_cost" is the capability of rulesets to specify how many units
-   of population are consumed on unit creation and/or can be added to
-   cities.
-
-   "turn" additionally transfers game.turn to the client.
-
-   "attributes" is the ability to request and transfer attribute blocks.
-
-   "new_bonus_tech" is the ability to make every tech a bonus tech
-   like A_PHILOSOPHY
-
-   "fund_added" introduces support for fundamentalism form of government.
-
-   "processing_packets" sends PACKET_PROCESSING_STARTED and
-   PACKET_PROCESSING_FINISHED packets.
-
-   "angrycitizen" introduces angry citizens, like those in
-   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.
-
-   "init_techs" allows global and nation specific initial techs to be
-   specified in rulesets.
-
-   "short_worklists" sends short worklists to reduce bandwidth used.
-
-   "tech_cost_style" allows using different algorithms for calculation
-   technology cost. The algorithm used is selected with
-   game.ruleset.tech_cost_style and game.ruleset.tech_leakage.
-
-   "short_city_tile_trade" sends the tile trade in the short_city
-   packet.
-
-   "trade_size" transfer game.notradesize and game.fulltradesize to
-   the client.
-
-   "new_nation_selection" transfer array of used nations instead of
-   bit mask
-
-   "client_worklists" the client keeps the global worklists not the server
-
-   "sound" is, well, sound specified in rulesets.
-
-   "u32timeout" designates that game.timeout is packeted as a uint32
-   instead of a uint16
-
-   "notifies" is a cleanup of event notifications
 */
 
 void init_our_capability(void)
Index: common/packets.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v
retrieving revision 1.207
diff -u -r1.207 packets.c
--- common/packets.c	2002/06/29 19:54:41	1.207
+++ common/packets.c	2002/07/11 08:20:58
@@ -1460,22 +1460,17 @@
 				   const struct worklist *pwl, bool real_wl)
 {
   int i, length;
-  bool short_wls = has_capability("short_worklists", pc->capability);
 
   buffer = put_bool8(buffer, pwl->is_valid);
 
-  if ((short_wls && pwl->is_valid) || !short_wls) {
-    if (real_wl && pwl->is_valid) {
+  if (pwl->is_valid) {
+    if (real_wl) {
       buffer = put_string(buffer, pwl->name);
     } else {
       buffer = put_string(buffer, "\0");
     }
-    if (short_wls) {
-      length = worklist_length(pwl);
-      buffer = put_uint8(buffer, length);
-    } else {
-      length = MAX_LEN_WORKLIST;
-    }
+    length = worklist_length(pwl);
+    buffer = put_uint8(buffer, length);
     for (i = 0; i < length; i++) {
       buffer = put_uint8(buffer, pwl->wlefs[i]);
       buffer = put_uint8(buffer, pwl->wlids[i]);
@@ -1492,22 +1487,17 @@
 			  struct worklist *pwl)
 {
   int i, length;
-  bool short_wls = has_capability("short_worklists", pc->capability);
 
   iget_bool8(piter, &pwl->is_valid);
 
-  if ((short_wls && pwl->is_valid) || !short_wls) {
+  if (pwl->is_valid) {
     iget_string(piter, pwl->name, MAX_LEN_NAME);
 
-    if (short_wls) {
-      iget_uint8(piter, &length);
+    iget_uint8(piter, &length);
 
-      if (length < MAX_LEN_WORKLIST) {
-	pwl->wlefs[length] = WEF_END;
-	pwl->wlids[length] = 0;
-      }
-    } else {
-      length = MAX_LEN_WORKLIST;
+    if (length < MAX_LEN_WORKLIST) {
+      pwl->wlefs[length] = WEF_END;
+      pwl->wlids[length] = 0;
     }
 
     for (i = 0; i < length; i++) {
@@ -1780,11 +1770,8 @@
   cptr=put_uint8(cptr, packet->science);
   cptr=put_uint8(cptr, packet->government);
   cptr=put_uint8(cptr, packet->tech);
+  cptr = put_bool8(cptr, req_type == PACKET_PLAYER_ATTRIBUTE_BLOCK);
 
-  if (has_capability("attributes", pc->capability)) {
-    cptr = put_bool8(cptr, req_type == PACKET_PLAYER_ATTRIBUTE_BLOCK);
-  }
-
   (void) put_uint16(buffer, cptr - buffer);
 
   return send_packet_data(pc, buffer, cptr-buffer);
@@ -1807,10 +1794,7 @@
   iget_uint8(&iter, &preq->science);
   iget_uint8(&iter, &preq->government);
   iget_uint8(&iter, &preq->tech);
-  if (has_capability("attributes", pc->capability))
-    iget_bool8(&iter, &preq->attribute_block);
-  else
-    preq->attribute_block = FALSE;
+  iget_bool8(&iter, &preq->attribute_block);
   
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
@@ -2082,11 +2066,7 @@
   cptr=put_uint32(cptr, pinfo->tech);
   cptr=put_uint8(cptr, pinfo->researchcost);
   cptr=put_uint32(cptr, pinfo->skill_level);
-  if (has_capability("u32timeout", pc->capability)) {
-    cptr=put_uint32(cptr, pinfo->timeout);
-  } else {
-    cptr=put_uint16(cptr, pinfo->timeout);
-  }
+  cptr = put_uint32(cptr, pinfo->timeout);
   cptr=put_uint32(cptr, pinfo->end_year);
   cptr=put_uint32(cptr, pinfo->year);
   cptr=put_uint8(cptr, pinfo->min_players);
@@ -2102,8 +2082,7 @@
   cptr=put_uint8(cptr, pinfo->freecost);
   cptr=put_uint8(cptr, pinfo->conquercost);
   cptr=put_uint8(cptr, pinfo->unhappysize);
-  if (has_capability("angrycitizen", pc->capability))
-    cptr = put_uint8(cptr, pinfo->angrycitizen);
+  cptr = put_uint8(cptr, pinfo->angrycitizen);
   
   for(i=0; i<A_LAST/*game.num_tech_types*/; i++)
     cptr=put_uint8(cptr, pinfo->global_advances[i]);
@@ -2118,9 +2097,7 @@
   /* computed values */
   cptr=put_uint32(cptr, pinfo->seconds_to_turndone);
 
-  if (has_capability("turn", pc->capability)) {
-    cptr = put_uint32(cptr, pinfo->turn);
-  }
+  cptr = put_uint32(cptr, pinfo->turn);
 
   (void) put_uint16(buffer, cptr - buffer);
 
@@ -2143,11 +2120,7 @@
   iget_uint32(&iter, &pinfo->tech);
   iget_uint8(&iter, &pinfo->researchcost);
   iget_uint32(&iter, &pinfo->skill_level);
-  if (has_capability("u32timeout", pc->capability)) {
-    iget_uint32(&iter, &pinfo->timeout);
-  } else {
-    iget_uint16(&iter, &pinfo->timeout);
-  }
+  iget_uint32(&iter, &pinfo->timeout);
   iget_uint32(&iter, &pinfo->end_year);
   iget_uint32(&iter, &pinfo->year);
   iget_uint8(&iter, &pinfo->min_players);
@@ -2163,10 +2136,7 @@
   iget_uint8(&iter, &pinfo->freecost);
   iget_uint8(&iter, &pinfo->conquercost);
   iget_uint8(&iter, &pinfo->unhappysize);
-  if (has_capability("angrycitizen", pc->capability))
-    iget_uint8(&iter, &pinfo->angrycitizen);
-  else
-    pinfo->angrycitizen = 0;
+  iget_uint8(&iter, &pinfo->angrycitizen);
   
   for(i=0; i<A_LAST/*game.num_tech_types*/; i++)
     iget_uint8(&iter, &pinfo->global_advances[i]);
@@ -2181,11 +2151,7 @@
   /* computed values */
   iget_uint32(&iter, &pinfo->seconds_to_turndone);
 
-  if (has_capability("turn", pc->capability)) {
-    iget_uint32(&iter, &pinfo->turn);
-  } else {
-    pinfo->turn = -1;
-  }
+  iget_uint32(&iter, &pinfo->turn);
 
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
@@ -2298,9 +2264,7 @@
   unsigned char buffer[MAX_LEN_PACKET], *cptr;
   cptr=put_uint8(buffer+2, PACKET_NEW_YEAR);
   cptr=put_uint32(cptr, request->year);
-  if (has_capability("turn", pc->capability)) {
-    cptr = put_uint32(cptr, request->turn);
-  }
+  cptr = put_uint32(cptr, request->turn);
   (void) put_uint16(buffer, cptr - buffer);
   return send_packet_data(pc, buffer, cptr-buffer);
 }
@@ -2407,8 +2371,7 @@
   cptr=put_uint8(cptr, req->size);
 
   for (data = 0; data < 5; data++) {
-    if (has_capability("angrycitizen", pc->capability))
-      cptr = put_uint8(cptr, req->ppl_angry[data]);
+    cptr = put_uint8(cptr, req->ppl_angry[data]);
     cptr=put_uint8(cptr, req->ppl_happy[data]);
     cptr=put_uint8(cptr, req->ppl_content[data]);
     cptr=put_uint8(cptr, req->ppl_unhappy[data]);
@@ -2423,9 +2386,7 @@
   cptr=put_uint16(cptr, req->shield_prod);
   cptr=put_uint16(cptr, req->shield_surplus);
   cptr=put_uint16(cptr, req->trade_prod);
-  if (has_capability("tile_trade", pc->capability)) {
-      cptr=put_uint16(cptr, req->tile_trade);
-  }
+  cptr = put_uint16(cptr, req->tile_trade);
   cptr=put_uint16(cptr, req->corruption);
 
   cptr=put_uint16(cptr, req->luxury_total);
@@ -2494,10 +2455,7 @@
   
   iget_uint8(&iter, &packet->size);
   for(data=0;data<5;data++) {
-    if (has_capability("angrycitizen", pc->capability))
-      iget_uint8(&iter, &packet->ppl_angry[data]);
-    else
-      packet->ppl_angry[data] = 0;
+    iget_uint8(&iter, &packet->ppl_angry[data]);
     iget_uint8(&iter, &packet->ppl_happy[data]);
     iget_uint8(&iter, &packet->ppl_content[data]);
     iget_uint8(&iter, &packet->ppl_unhappy[data]);
@@ -2513,11 +2471,7 @@
   iget_uint16(&iter, &packet->shield_surplus);
   if(packet->shield_surplus > 32767) packet->shield_surplus-=65536;
   iget_uint16(&iter, &packet->trade_prod);
-  if (has_capability("tile_trade", pc->capability)) {
-    iget_uint16(&iter, &packet->tile_trade);
-  } else {
-    packet->tile_trade = 0;
-  }
+  iget_uint16(&iter, &packet->tile_trade);
   iget_uint16(&iter, &packet->corruption);
 
   iget_uint16(&iter, &packet->luxury_total);
@@ -2589,9 +2543,7 @@
 			  COND_SET_BIT(req->capital, 1) |
 			  COND_SET_BIT(req->walls, 2)));
 
-  if (has_capability("short_city_tile_trade", pc->capability)) {
-    cptr = put_uint16(cptr, req->tile_trade);
-  }
+  cptr = put_uint16(cptr, req->tile_trade);
 
   (void) put_uint16(buffer, cptr - buffer);
 
@@ -2625,11 +2577,7 @@
   packet->capital = TEST_BIT(i, 1);
   packet->walls   = TEST_BIT(i, 2);
 
-  if (has_capability("short_city_tile_trade", pc->capability)) {
-    iget_uint16(&iter, &packet->tile_trade);
-  } else {
-    packet->tile_trade = 0;
-  }
+  iget_uint16(&iter, &packet->tile_trade);
 
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
@@ -2702,13 +2650,8 @@
   pack_iter_init(&iter, pc);
 
   iget_uint32(&iter, &packet->year);
+  iget_uint32(&iter, &packet->turn);
 
-  if (has_capability("turn", pc->capability)) {
-    iget_uint32(&iter, &packet->turn);
-  } else {
-    packet->turn = -3;
-  }
-
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
   return packet;
@@ -3049,14 +2992,9 @@
   cptr=put_uint8(cptr, packet->aqueduct_size);
   cptr=put_uint8(cptr, packet->sewer_size);
   cptr=put_uint8(cptr, packet->add_to_size_limit);
-  if (has_capability("trade_size", pc->capability)) {
-    cptr = put_uint8(cptr, packet->notradesize);
-    cptr = put_uint8(cptr, packet->fulltradesize);
-  }
+  cptr = put_uint8(cptr, packet->notradesize);
+  cptr = put_uint8(cptr, packet->fulltradesize);
 
-  if (!has_capability("new_bonus_tech", pc->capability)) {
-    cptr = put_uint8(cptr, packet->rtech.get_bonus_tech);
-  }
   cptr=put_uint8(cptr, packet->rtech.cathedral_plus);
   cptr=put_uint8(cptr, packet->rtech.cathedral_minus);
   cptr=put_uint8(cptr, packet->rtech.colosseum_plus);
@@ -3096,17 +3034,9 @@
   iget_uint8(&iter, &packet->aqueduct_size);
   iget_uint8(&iter, &packet->sewer_size);
   iget_uint8(&iter, &packet->add_to_size_limit);
-  if (has_capability("trade_size", pc->capability)) {
-    iget_uint8(&iter, &packet->notradesize);
-    iget_uint8(&iter, &packet->fulltradesize);
-  } else {
-    packet->notradesize = 0;
-    packet->fulltradesize = 1;
-  }
+  iget_uint8(&iter, &packet->notradesize);
+  iget_uint8(&iter, &packet->fulltradesize);
 
-  if (!has_capability("new_bonus_tech", pc->capability)) {
-    iget_uint8(&iter, &packet->rtech.get_bonus_tech);
-  }
   iget_uint8(&iter, &packet->rtech.cathedral_plus);
   iget_uint8(&iter, &packet->rtech.cathedral_minus);
   iget_uint8(&iter, &packet->rtech.colosseum_plus);
@@ -3162,20 +3092,17 @@
   cptr=put_string(cptr, packet->name);
   cptr=put_string(cptr, packet->graphic_str);
   cptr=put_string(cptr, packet->graphic_alt);
-  if (has_capability("sound", pc->capability)) {
-    cptr = put_string(cptr, packet->sound_move);
-    cptr = put_string(cptr, packet->sound_move_alt);
-    cptr = put_string(cptr, packet->sound_fight);
-    cptr = put_string(cptr, packet->sound_fight_alt);
-  }
+  cptr = put_string(cptr, packet->sound_move);
+  cptr = put_string(cptr, packet->sound_move_alt);
+  cptr = put_string(cptr, packet->sound_fight);
+  cptr = put_string(cptr, packet->sound_fight_alt);
+
   if(unit_type_flag(packet->id, F_PARATROOPERS)) {
     cptr=put_uint16(cptr, packet->paratroopers_range);
     cptr=put_uint8(cptr, packet->paratroopers_mr_req);
     cptr=put_uint8(cptr, packet->paratroopers_mr_sub);
   }
-  if (has_capability("pop_cost", pc->capability)) {
-    cptr=put_uint8(cptr, packet->pop_cost);
-  }
+  cptr = put_uint8(cptr, packet->pop_cost);
 
   /* This must be last, so client can determine length: */
   if(packet->helptext) {
@@ -3222,19 +3149,12 @@
   iget_string(&iter, packet->name, sizeof(packet->name));
   iget_string(&iter, packet->graphic_str, sizeof(packet->graphic_str));
   iget_string(&iter, packet->graphic_alt, sizeof(packet->graphic_alt));
-  if (has_capability("sound", pc->capability)) {
-    iget_string(&iter, packet->sound_move, sizeof(packet->sound_move));
-    iget_string(&iter, packet->sound_move_alt,
-		sizeof(packet->sound_move_alt));
-    iget_string(&iter, packet->sound_fight, sizeof(packet->sound_fight));
-    iget_string(&iter, packet->sound_fight_alt,
-		sizeof(packet->sound_fight_alt));
-  } else {
-    sz_strlcpy(packet->sound_move, "m_generic");
-    sz_strlcpy(packet->sound_move_alt, "-");
-    sz_strlcpy(packet->sound_fight, "f_generic");
-    sz_strlcpy(packet->sound_fight_alt, "-");
-  }
+  iget_string(&iter, packet->sound_move, sizeof(packet->sound_move));
+  iget_string(&iter, packet->sound_move_alt, sizeof(packet->sound_move_alt));
+  iget_string(&iter, packet->sound_fight, sizeof(packet->sound_fight));
+  iget_string(&iter, packet->sound_fight_alt,
+	      sizeof(packet->sound_fight_alt));
+
   if(TEST_BIT(packet->flags, F_PARATROOPERS)) {
     iget_uint16(&iter, &packet->paratroopers_range);
     iget_uint8(&iter, &packet->paratroopers_mr_req);
@@ -3244,11 +3164,7 @@
     packet->paratroopers_mr_req=0;
     packet->paratroopers_mr_sub=0;
   }
-  if (has_capability("pop_cost", pc->capability)) {
-    iget_uint8(&iter, &packet->pop_cost);
-  } else {
-    packet->pop_cost = TEST_BIT(packet->flags, F_CITIES) ? 1 : 0;
-  }  
+  iget_uint8(&iter, &packet->pop_cost);
 
   len = pack_iter_remaining(&iter);
   if (len > 0) {
@@ -3277,10 +3193,8 @@
   cptr=put_uint8(cptr, packet->req[0]);
   cptr=put_uint8(cptr, packet->req[1]);
   cptr=put_uint32(cptr, packet->flags);
-  if (has_capability("tech_cost_style", pc->capability)) {
-    cptr = put_uint32(cptr, packet->preset_cost);
-    cptr = put_uint32(cptr, packet->num_reqs);
-  }
+  cptr = put_uint32(cptr, packet->preset_cost);
+  cptr = put_uint32(cptr, packet->num_reqs);
   cptr=put_string(cptr, packet->name);
   
   /* This must be last, so client can determine length: */
@@ -3309,10 +3223,8 @@
   iget_uint8(&iter, &packet->req[0]);
   iget_uint8(&iter, &packet->req[1]);
   iget_uint32(&iter, &packet->flags);
-  if (has_capability("tech_cost_style", pc->capability)) {
-    iget_uint32(&iter, &packet->preset_cost);
-    iget_uint32(&iter, &packet->num_reqs);
-  }
+  iget_uint32(&iter, &packet->preset_cost);
+  iget_uint32(&iter, &packet->num_reqs);
   iget_string(&iter, packet->name, sizeof(packet->name));
 
   len = pack_iter_remaining(&iter);
@@ -3374,10 +3286,8 @@
   cptr=put_uint8(cptr, packet->variant);	/* FIXME: remove when gen-impr obsoletes */
   cptr=put_string(cptr, packet->name);
 
-  if (has_capability("sound", pc->capability)) {
-    cptr = put_string(cptr, packet->soundtag);
-    cptr = put_string(cptr, packet->soundtag_alt);
-  }
+  cptr = put_string(cptr, packet->soundtag);
+  cptr = put_string(cptr, packet->soundtag_alt);
 
   /* This must be last, so client can determine length: */
   if(packet->helptext) {
@@ -3433,14 +3343,8 @@
   iget_uint8(&iter, &packet->variant);	/* FIXME: remove when gen-impr obsoletes */
   iget_string(&iter, packet->name, sizeof(packet->name));
 
-  if (has_capability("sound", pc->capability)) {
-    iget_string(&iter, packet->soundtag, sizeof(packet->soundtag));
-    iget_string(&iter, packet->soundtag_alt, sizeof(packet->soundtag_alt));
-  } else {
-    sz_strlcpy(packet->soundtag,
-	       packet->is_wonder ? "w_generic" : "b_generic");
-    sz_strlcpy(packet->soundtag_alt, "-");
-  }
+  iget_string(&iter, packet->soundtag, sizeof(packet->soundtag));
+  iget_string(&iter, packet->soundtag_alt, sizeof(packet->soundtag_alt));
 
   len = pack_iter_remaining(&iter);
   if (len > 0) {
@@ -3708,10 +3612,7 @@
   cptr=put_uint8(cptr, packet->corruption_distance_factor);
   cptr=put_uint8(cptr, packet->extra_corruption_distance);
 
-  if (has_capability("fund_added", pc->capability))
-    cptr = put_uint16(cptr, packet->flags);
-  else
-    cptr = put_uint8(cptr, packet->flags);
+  cptr = put_uint16(cptr, packet->flags);
   cptr=put_uint8(cptr, packet->hints);
 
   cptr=put_uint8(cptr, packet->num_ruler_titles);
@@ -3805,10 +3706,7 @@
   iget_uint8(&iter, &packet->corruption_distance_factor);
   iget_uint8(&iter, &packet->extra_corruption_distance);
 
-  if (has_capability("fund_added", pc->capability))
-    iget_uint16(&iter, &packet->flags);
-  else
-    iget_uint8(&iter, &packet->flags);
+  iget_uint16(&iter, &packet->flags);
   iget_uint8(&iter, &packet->hints);
 
   iget_uint8(&iter, &packet->num_ruler_titles);
@@ -3874,9 +3772,7 @@
     cptr=put_bool8(cptr, packet->leader_sex[i]);
   }
   cptr=put_uint8(cptr, packet->city_style);
-  if (has_capability("init_techs", pc->capability)) {
-    cptr = put_tech_list(cptr, packet->init_techs);
-  }
+  cptr = put_tech_list(cptr, packet->init_techs);
 
   (void) put_uint16(buffer, cptr - buffer);
 
@@ -3908,9 +3804,7 @@
     iget_bool8(&iter, &packet->leader_sex[i]);
   }
   iget_uint8(&iter, &packet->city_style);
-  if (has_capability("init_techs", pc->capability)) {
-    iget_tech_list(&iter, packet->init_techs);
-  }
+  iget_tech_list(&iter, packet->init_techs);
 
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
@@ -3984,13 +3878,9 @@
   cptr=put_uint8(cptr, packet->nuke_contamination);
   cptr=put_uint8(cptr, packet->granary_food_ini);
   cptr=put_uint8(cptr, packet->granary_food_inc);
-  if (has_capability("tech_cost_style", pc->capability)) {
-    cptr = put_uint8(cptr, packet->tech_cost_style);
-    cptr = put_uint8(cptr, packet->tech_leakage);
-  }
-  if (has_capability("init_techs", pc->capability)) {
-    cptr = put_tech_list(cptr, packet->global_init_techs);
-  }
+  cptr = put_uint8(cptr, packet->tech_cost_style);
+  cptr = put_uint8(cptr, packet->tech_leakage);
+  cptr = put_tech_list(cptr, packet->global_init_techs);
 
   (void) put_uint16(buffer, cptr - buffer);
   return send_packet_data(pc, buffer, cptr-buffer);
@@ -4018,13 +3908,9 @@
   iget_uint8(&iter, &packet->nuke_contamination);
   iget_uint8(&iter, &packet->granary_food_ini);
   iget_uint8(&iter, &packet->granary_food_inc);
-  if (has_capability("tech_cost_style", pc->capability)) {
-    iget_uint8(&iter, &packet->tech_cost_style);
-    iget_uint8(&iter, &packet->tech_leakage);
-  }
-  if (has_capability("init_techs", pc->capability)) {
-    iget_tech_list(&iter, packet->global_init_techs);
-  }
+  iget_uint8(&iter, &packet->tech_cost_style);
+  iget_uint8(&iter, &packet->tech_leakage);
+  iget_tech_list(&iter, packet->global_init_techs);
 
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
Index: common/packets.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.h,v
retrieving revision 1.116
diff -u -r1.116 packets.h
--- common/packets.h	2002/05/16 10:10:23	1.116
+++ common/packets.h	2002/07/11 08:20:59
@@ -557,9 +557,6 @@
   int num_impr_types;
   int num_tech_types;
   struct {
-    /* when removing the new_bonus_tech capability remove the
-       following line; has_capability("new_bonus_tech",  */
-    int get_bonus_tech;
     int cathedral_plus;
     int cathedral_minus;
     int colosseum_plus;
Index: server/ruleset.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/ruleset.c,v
retrieving revision 1.112
diff -u -r1.112 ruleset.c
--- server/ruleset.c	2002/07/05 16:30:17	1.112
+++ server/ruleset.c	2002/07/11 08:21:01
@@ -1728,9 +1728,6 @@
   packet.notradesize = game.notradesize;
   packet.fulltradesize = game.fulltradesize;
 
-  /* when removing the new_bonus_tech capability remove the following
-     line; has_capability("new_bonus_tech", */
-  packet.rtech.get_bonus_tech = find_tech_by_flag(0, TF_BONUS_TECH);
   packet.rtech.cathedral_plus = game.rtech.cathedral_plus;
   packet.rtech.cathedral_minus = game.rtech.cathedral_minus;
   packet.rtech.colosseum_plus = game.rtech.colosseum_plus;
Index: server/sernet.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/sernet.c,v
retrieving revision 1.92
diff -u -r1.92 sernet.c
--- server/sernet.c	2002/05/25 17:44:09	1.92
+++ server/sernet.c	2002/07/11 08:21:01
@@ -795,10 +795,7 @@
   assert(pconn->server.currently_processed_request_id == 0);
   freelog(LOG_DEBUG, "start processing packet %d from connection %d",
 	  request_id, pconn->id);
-  if (strlen(pconn->capability) == 0
-      || has_capability("processing_packets", pconn->capability)) {
-    send_packet_generic_empty(pconn, PACKET_PROCESSING_STARTED);
-  }
+  send_packet_generic_empty(pconn, PACKET_PROCESSING_STARTED);
   pconn->server.currently_processed_request_id = request_id;
 }
 
@@ -810,9 +807,6 @@
   assert(pconn->server.currently_processed_request_id);
   freelog(LOG_DEBUG, "finish processing packet %d from connection %d",
 	  pconn->server.currently_processed_request_id, pconn->id);
-  if (strlen(pconn->capability) == 0
-      || has_capability("processing_packets", pconn->capability)) {
-    send_packet_generic_empty(pconn, PACKET_PROCESSING_FINISHED);
-  }
+  send_packet_generic_empty(pconn, PACKET_PROCESSING_FINISHED);
   pconn->server.currently_processed_request_id = 0;
 }
Index: server/unithand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unithand.c,v
retrieving revision 1.226
diff -u -r1.226 unithand.c
--- server/unithand.c	2002/07/02 06:16:12	1.226
+++ server/unithand.c	2002/07/11 08:21:02
@@ -68,7 +68,7 @@
 
   /* 
    * Discard invalid packet. Replace this with is_normal_map_pos if
-   * capstr is set to "1.12.0".
+   * 1.13.1-devel is started.
    */
   if (!normalize_map_pos(&req->x, &req->y)) {
     return;
@@ -108,7 +108,7 @@
 
   /* 
    * Discard invalid packet. Replace this with is_normal_map_pos if
-   * capstr is set to "1.12.0".
+   * 1.13.1-devel is started.
    */
   if (!normalize_map_pos(&req->x, &req->y)) {
     return;
@@ -132,7 +132,7 @@
 
   /* 
    * Discard invalid packet. Replace this with is_normal_map_pos if
-   * capstr is set to "1.12.0".
+   * 1.13.1-devel is started.
    */
   if (!normalize_map_pos(&req->dest_x, &req->dest_y)) {
     return;
@@ -598,8 +598,8 @@
 
   if (!same_pos(punit->x, punit->y, pinfo->x, pinfo->y)) {
     /* 
-     * Discard invalid packet. Replace this with is_normal_map_pos
-     * if capstr is set to "1.12.0".
+     * Discard invalid packet. Replace this with is_normal_map_pos if
+     * 1.13.1-devel is started.
      */
     if (!normalize_map_pos(&pinfo->x, &pinfo->y)) {
       return;
@@ -636,7 +636,7 @@
 
   /* 
    * Discard invalid packet. Replace this with is_normal_map_pos if
-   * capstr is set to "1.12.0".
+   * 1.13.1-devel is started.
    */
   if (!normalize_map_pos(&pmove->x, &pmove->y)) {
     return;
@@ -908,7 +908,7 @@
 
   /* 
    * Discard invalid packet. Replace this with is_normal_map_pos if
-   * capstr is set to "1.12.0".
+   * 1.13.1-devel is started.
    */
   if (!normalize_map_pos(&dest_x, &dest_y)) {
     return FALSE;