* Merge of ioq3-r1189

  + Fix bug that prevented key up events getting to cgame/ui when not in game
  + Use Key_[GS]etCatcher everywhere to set keycatcher
  + Clear all key states when the catcher changes
* Slim down client userinfo somewhat
* Remove some redundant client autocomplete commands
* Actually make use of "menuStack" in the UI module
  + No longer close all menus when exiting one, instead reverting to the
    next one on the stack
  + Cleanup the menu activation functions a little
* Truncate text in list columns if it exceeds the column width
* Remove maxChars field from columns member of ITEM_TYPE_LISTBOX
* Revert r992 due to more general and less buggy/hacky fix from ioq3

2 files changed, 6 insertions, 22 deletions

diff --git a/src/game/g_client.c b/src/game/g_client.c
index bed2fefd..66ba3b6f 100644
--- a/src/game/g_client.c
+++ b/src/game/g_client.c
@@ -944,7 +944,7 @@ if desired.
 void ClientUserinfoChanged( int clientNum )
 {
   gentity_t *ent;
-  int       teamTask, teamLeader, health;
+  int       health;
   char      *s;
   char      model[ MAX_QPATH ];
   char      buffer[ MAX_QPATH ];
@@ -974,14 +974,6 @@ void ClientUserinfoChanged( int clientNum )
   if( !strcmp( s, "localhost" ) )
     client->pers.localClient = qtrue;
 
-  // check the item prediction
-  s = Info_ValueForKey( userinfo, "cg_predictItems" );
-
-  if( !atoi( s ) )
-    client->pers.predictItemPickup = qfalse;
-  else
-    client->pers.predictItemPickup = qtrue;
-
   // set name
   Q_strncpyz( oldname, client->pers.netname, sizeof( oldname ) );
   s = Info_ValueForKey( userinfo, "name" );
@@ -1118,16 +1110,11 @@ void ClientUserinfoChanged( int clientNum )
   // teamInfo
   s = Info_ValueForKey( userinfo, "teamoverlay" );
 
-  if( ! *s || atoi( s ) != 0 )
+  if( !*s || atoi( s ) != 0 )
     client->pers.teamInfo = qtrue;
   else
     client->pers.teamInfo = qfalse;
 
-  // team task (0 = none, 1 = offence, 2 = defence)
-  teamTask = atoi( Info_ValueForKey( userinfo, "teamtask" ) );
-  // team Leader (1 = leader, 0 is normal player)
-  teamLeader = client->sess.teamLeader;
-
   // colors
   strcpy( c1, Info_ValueForKey( userinfo, "color1" ) );
   strcpy( c2, Info_ValueForKey( userinfo, "color2" ) );
@@ -1141,12 +1128,10 @@ void ClientUserinfoChanged( int clientNum )
   // print scoreboards, display models, and play custom sounds
 
   Com_sprintf( userinfo, sizeof( userinfo ),
-    "n\\%s\\t\\%i\\model\\%s\\hmodel\\%s\\c1\\%s\\c2\\%s\\"
-    "hc\\%i\\w\\%i\\l\\%i\\tt\\%d\\"
-    "tl\\%d\\ig\\%16s",
-    client->pers.netname, team, model, model, c1, c2,
-    client->pers.maxHealth, client->sess.wins, client->sess.losses, teamTask,
-    teamLeader, BG_ClientListString( &client->sess.ignoreList ) );
+    "n\\%s\\t\\%i\\model\\%s\\c1\\%s\\c2\\%s\\"
+    "hc\\%i\\ig\\%16s",
+    client->pers.netname, team, model, c1, c2,
+    client->pers.maxHealth, BG_ClientListString( &client->sess.ignoreList ) );
 
   trap_SetConfigstring( CS_PLAYERS + clientNum, userinfo );
 
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 643757aa..54600578 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -322,7 +322,6 @@ typedef struct
   usercmd_t           cmd;                // we would lose angles if not persistant
   qboolean            localClient;        // true if "ip" info key is "localhost"
   qboolean            initialSpawn;       // the first spawn should be at a cool location
-  qboolean            predictItemPickup;  // based on cg_predictItems userinfo
   qboolean            pmoveFixed;         //
   char                netname[ MAX_NETNAME ];
   int                 maxHealth;          // for handicapping