Index: client/packhand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v retrieving revision 1.223 diff -u -r1.223 packhand.c --- client/packhand.c 2002/02/27 11:46:15 1.223 +++ client/packhand.c 2002/03/04 17:15:39 @@ -157,6 +157,7 @@ freelog(LOG_VERBOSE, "join game accept:%s", packet->message); aconnection.established = TRUE; game.conn_id = packet->conn_id; + agents_game_joined(); } else { my_snprintf(msg, sizeof(msg), _("You were rejected from the game: %s"), packet->message); @@ -167,7 +168,6 @@ } } if (strcmp(s_capability, our_capability) == 0) { - agents_game_joined(); return; } my_snprintf(msg, sizeof(msg), Index: client/agents/agents.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/agents/agents.c,v retrieving revision 1.9 diff -u -r1.9 agents.c --- client/agents/agents.c 2002/02/26 19:57:10 1.9 +++ client/agents/agents.c 2002/03/04 17:15:39 @@ -337,10 +337,6 @@ void agents_game_joined(void) { freelog(META_CALLBACKS_LOGLEVEL, "agents_game_joined()"); - assert(has_capability("turn", aconnection.capability)); - assert(has_capability("attributes", aconnection.capability)); - assert(has_capability("processing_packets", aconnection.capability)); - assert(has_capability("tile_trade", aconnection.capability)); freeze(); } Index: common/capstr.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v retrieving revision 1.95 diff -u -r1.95 capstr.c --- common/capstr.c 2002/02/16 17:44:43 1.95 +++ common/capstr.c 2002/03/04 17:15:58 @@ -70,9 +70,10 @@ * 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" +#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" /* "+1.11.6" is protocol for 1.11.6 beta release.