* Prevent people from reconnecting so they can call more votes

* Remove a few unused variables and an unused function

2 files changed, 0 insertions, 45 deletions

diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 5d296fe0..423a0fa7 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -724,9 +724,6 @@ typedef struct
 
   char        name[ MAX_QPATH ];
   team_t      team;
-  
-  vec3_t      color1;
-  vec3_t      color2;
 
   int         score;                      // updated by score servercmds
   int         location;                   // location index for team mode
@@ -734,8 +731,6 @@ typedef struct
   int         upgrade; 
   int         curWeaponClass;             // sends current weapon for H, current class for A
 
-  int         handicap;
-
   // when clientinfo is changed, the loading of models/skins/sounds
   // can be deferred until you are dead, to prevent hitches in
   // gameplay
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index d22a87d8..f3553035 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -487,35 +487,6 @@ static qboolean CG_RegisterClientModelname( clientInfo_t *ci, const char *modelN
   return qtrue;
 }
 
-/*
-====================
-CG_ColorFromString
-====================
-*/
-static void CG_ColorFromString( const char *v, vec3_t color )
-{
-  int val;
-
-  VectorClear( color );
-
-  val = atoi( v );
-
-  if( val < 1 || val > 7 )
-  {
-    VectorSet( color, 1, 1, 1 );
-    return;
-  }
-
-  if( val & 1 )
-    color[ 2 ] = 1.0f;
-
-  if( val & 2 )
-    color[ 1 ] = 1.0f;
-
-  if( val & 4 )
-    color[ 0 ] = 1.0f;
-}
-
 
 /*
 ===================
@@ -786,17 +757,6 @@ void CG_NewClientInfo( int clientNum )
   v = Info_ValueForKey( configstring, "n" );
   Q_strncpyz( newInfo.name, v, sizeof( newInfo.name ) );
 
-  // colors
-  v = Info_ValueForKey( configstring, "c1" );
-  CG_ColorFromString( v, newInfo.color1 );
-
-  v = Info_ValueForKey( configstring, "c2" );
-  CG_ColorFromString( v, newInfo.color2 );
-
-  // handicap
-  v = Info_ValueForKey( configstring, "hc" );
-  newInfo.handicap = atoi( v );
-
   // team
   v = Info_ValueForKey( configstring, "t" );
   newInfo.team = atoi( v );