[Freeciv-Dev] (PR#11469) fix capstring

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=11469 >

This patch removes the gov_req capability (which isn't checked anyway) 
as well as removing a forgotten check for the player username capability.

-jason

Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.443
diff -u -r1.443 packhand.c
--- client/packhand.c   11 Dec 2004 10:34:46 -0000      1.443
+++ client/packhand.c   11 Dec 2004 10:52:00 -0000
@@ -1605,15 +1605,7 @@
     } conn_list_iterate_end;
   }
 
-  if (has_capability("username_info", aconnection.capability)) {
-    sz_strlcpy(pplayer->username, pinfo->username);
-  } else {
-    conn_list_iterate(game.est_connections, pconn) {
-      if (pconn->player == pplayer && !pconn->observer) {
-        sz_strlcpy(pplayer->username, pconn->username);
-      }
-    } conn_list_iterate_end;
-  }
+  sz_strlcpy(pplayer->username, pinfo->username);
 
   /* Just about any changes above require an update to the intelligence
    * dialog. */
Index: common/capstr.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/capstr.c,v
retrieving revision 1.206
diff -u -r1.206 capstr.c
--- common/capstr.c     11 Dec 2004 10:34:47 -0000      1.206
+++ common/capstr.c     11 Dec 2004 10:52:00 -0000
@@ -82,7 +82,7 @@
  *     as long as possible.  We want to maintain network compatibility with
  *     the stable branch for as long as possible.
  */
-#define CAPABILITY "+Freeciv.Devel.2004.Dec.11 gov_req"
+#define CAPABILITY "+Freeciv.Devel.2004.Dec.11b"
 
 void init_our_capability(void)
 {
Index: common/packets.def
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.def,v
retrieving revision 1.73
diff -u -r1.73 packets.def
--- common/packets.def  11 Dec 2004 10:34:47 -0000      1.73
+++ common/packets.def  11 Dec 2004 10:52:00 -0000
@@ -939,7 +939,7 @@
   UINT8 move_rate;
   TECH tech_requirement;
   UINT8 impr_requirement;
-  GOVERNMENT gov_requirement; add-cap(gov_req)
+  GOVERNMENT gov_requirement;
   UINT8 vision_range;
   UINT8 transport_capacity;
   UINT8 hp;