* Remove more powerups stuff

6 files changed, 9 insertions, 36 deletions

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index cb990e4a..774b10c4 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -284,7 +284,7 @@ void CG_Text_Paint( float x, float y, float scale, vec4_t color, const char *tex
 ==============
 CG_DrawFieldPadded
 
-Draws large numbers for status bar and powerups
+Draws large numbers for status bar
 ==============
 */
 static void CG_DrawFieldPadded( int x, int y, int width, int cw, int ch, int value )
@@ -364,7 +364,7 @@ static void CG_DrawFieldPadded( int x, int y, int width, int cw, int ch, int val
 ==============
 CG_DrawField
 
-Draws large numbers for status bar and powerups
+Draws large numbers for status bar
 ==============
 */
 void CG_DrawField( float x, float y, int width, float cw, float ch, int value )
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index dba61fd3..4952eef4 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -725,8 +725,6 @@ typedef struct
   int         teamTask;                   // task in teamplay (offence/defence)
   qboolean    teamLeader;                 // true when this is a team leader
 
-  int         powerups;                   // so can display quad/flag status
-
   int         medkitUsageTime;
   int         invulnerabilityStartTime;
   int         invulnerabilityStopTime;
@@ -1626,7 +1624,6 @@ void        CG_DrawField( float x, float y, int width, float cw, float ch, int v
 void        CG_Player( centity_t *cent );
 void        CG_Corpse( centity_t *cent );
 void        CG_ResetPlayerEntity( centity_t *cent );
-void        CG_AddRefEntityWithPowerups( refEntity_t *ent, int powerups, int team );
 void        CG_NewClientInfo( int clientNum );
 void        CG_PrecacheClientInfo( pClass_t class, char *model, char *skin );
 sfxHandle_t CG_CustomSound( int clientNum, const char *soundName );
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index bc3aaa47..f0800fa5 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2379,7 +2379,6 @@ void CG_Corpse( centity_t *cent )
     legs.nonNormalizedAxes = qtrue;
   }
 
-  //CG_AddRefEntityWithPowerups( &legs, es->misc, ci->team );
   trap_R_AddRefEntityToScene( &legs );
 
   // if the model failed, allow the default nullmodel to be displayed
@@ -2404,7 +2403,6 @@ void CG_Corpse( centity_t *cent )
     torso.shadowPlane = shadowPlane;
     torso.renderfx = renderfx;
 
-    //CG_AddRefEntityWithPowerups( &torso, es->misc, ci->team );
     trap_R_AddRefEntityToScene( &torso );
 
     //
@@ -2423,7 +2421,6 @@ void CG_Corpse( centity_t *cent )
     head.shadowPlane = shadowPlane;
     head.renderfx = renderfx;
 
-    //CG_AddRefEntityWithPowerups( &head, es->misc, ci->team );
     trap_R_AddRefEntityToScene( &head );
   }
 }
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index 7fb3e060..811733e7 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -65,7 +65,6 @@ static void CG_ParseScores( void )
       cg.scores[ i ].client = 0;
 
     cgs.clientinfo[ cg.scores[ i ].client ].score = cg.scores[ i ].score;
-    cgs.clientinfo[ cg.scores[ i ].client ].powerups = 0;
 
     cg.scores[ i ].team = cgs.clientinfo[ cg.scores[ i ].client ].team;
   }
@@ -86,15 +85,14 @@ static void CG_ParseTeamInfo( void )
 
   for( i = 0; i < numSortedTeamPlayers; i++ )
   {
-    client = atoi( CG_Argv( i * 6 + 2 ) );
+    client = atoi( CG_Argv( i * 5 + 2 ) );
 
     sortedTeamPlayers[ i ] = client;
 
-    cgs.clientinfo[ client ].location = atoi( CG_Argv( i * 6 + 3 ) );
-    cgs.clientinfo[ client ].health = atoi( CG_Argv( i * 6 + 4 ) );
-    cgs.clientinfo[ client ].armor = atoi( CG_Argv( i * 6 + 5 ) );
-    cgs.clientinfo[ client ].curWeapon = atoi( CG_Argv( i * 6 + 6 ) );
-    cgs.clientinfo[ client ].powerups = atoi( CG_Argv( i * 6 + 7 ) );
+    cgs.clientinfo[ client ].location = atoi( CG_Argv( i * 5 + 3 ) );
+    cgs.clientinfo[ client ].health = atoi( CG_Argv( i * 5 + 4 ) );
+    cgs.clientinfo[ client ].armor = atoi( CG_Argv( i * 5 + 5 ) );
+    cgs.clientinfo[ client ].curWeapon = atoi( CG_Argv( i * 5 + 6 ) );
   }
 }
 
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 36e6a0aa..68217cf0 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -295,24 +295,6 @@ typedef enum
 
 typedef enum
 {
-  PW_NONE,
-
-  PW_QUAD,
-  PW_BATTLESUIT,
-  PW_HASTE,
-  PW_INVIS,
-  PW_REGEN,
-  PW_FLIGHT,
-
-  PW_REDFLAG,
-  PW_BLUEFLAG,
-  PW_BALL,
-
-  PW_NUM_POWERUPS
-} powerup_t;
-
-typedef enum
-{
   HI_NONE,
 
   HI_TELEPORTER,
diff --git a/src/game/g_team.c b/src/game/g_team.c
index f2293922..85582f19 100644
--- a/src/game/g_team.c
+++ b/src/game/g_team.c
@@ -195,10 +195,9 @@ void TeamplayInfoMessage( gentity_t *ent )
         h = 0;
 
       Com_sprintf( entry, sizeof( entry ),
-        " %i %i %i %i %i %i",
-//        level.sortedClients[i], player->client->pers.teamState.location, h, a,
+        " %i %i %i %i %i",
         i, player->client->pers.teamState.location, h, a,
-        player->client->ps.weapon, player->s.misc );
+        player->client->ps.weapon );
 
       j = strlen( entry );