1 files changed, 9 insertions, 8 deletions

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 5acb96d8..e0c8d768 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -216,9 +216,9 @@ void CG_DrawFlagModel( float x, float y, float w, float h, int team, qboolean fo
       team == TEAM_HUMANS ? cgs.media.redFlagModel : cgs.media.blueFlagModel,
       0, origin, angles );
   } else if ( cg_drawIcons.integer ) {
-    gitem_t *item = BG_FindItemForPowerup( team == TEAM_HUMANS ? PW_REDFLAG : PW_BLUEFLAG );
+/*    gitem_t *item = BG_FindItemForPowerup( team == TEAM_HUMANS ? PW_REDFLAG : PW_BLUEFLAG );
 
-    CG_DrawPic( x, y, w, h, cg_items[ ITEM_INDEX(item) ].icon );
+    CG_DrawPic( x, y, w, h, cg_items[ ITEM_INDEX(item) ].icon );*/
   }
 }
 
@@ -451,7 +451,7 @@ static void CG_DrawStatusBar( void ) {
   //
   if ( cent->currentState.weapon ) {
     //TA: must mask off clips and maxClips
-    if( !BG_infiniteAmmo( cent->currentState.weapon ) )
+    if( !BG_FindInfinteAmmoForWeapon( cent->currentState.weapon ) )
       BG_unpackAmmoArray( cent->currentState.weapon, ps->ammo, ps->powerups, &ammo, &clips, &maxclips );
     else
       ammo = -1;
@@ -1088,7 +1088,7 @@ static float CG_DrawScores( float y ) {
 
     if ( cgs.gametype == GT_CTF ) {
       // Display flag status
-      item = BG_FindItemForPowerup( PW_BLUEFLAG );
+      /*item = BG_FindItemForPowerup( PW_BLUEFLAG );*/
 
       if (item) {
         y1 = y - BIGCHAR_HEIGHT - 8;
@@ -1113,7 +1113,7 @@ static float CG_DrawScores( float y ) {
 
     if ( cgs.gametype == GT_CTF ) {
       // Display flag status
-      item = BG_FindItemForPowerup( PW_REDFLAG );
+      /*item = BG_FindItemForPowerup( PW_REDFLAG );*/
 
       if (item) {
         y1 = y - BIGCHAR_HEIGHT - 8;
@@ -1263,7 +1263,7 @@ static float CG_DrawPowerups( float y ) {
   // draw the icons and timers
   x = 640 - ICON_SIZE - CHAR_WIDTH * 2;
   for ( i = 0 ; i < active ; i++ ) {
-    item = BG_FindItemForPowerup( sorted[i] );
+    /*item = BG_FindItemForPowerup( sorted[i] );*/
 
     if (item) {
 
@@ -1343,10 +1343,11 @@ static int CG_DrawPickupItem( int y ) {
   if ( value ) {
     fadeColor = CG_FadeColor( cg.itemPickupTime, 3000 );
     if ( fadeColor ) {
-      CG_RegisterItemVisuals( value );
+      /*CG_RegisterItemVisuals( value );*/
       trap_R_SetColor( fadeColor );
       CG_DrawPic( 8, y, ICON_SIZE, ICON_SIZE, cg_items[ value ].icon );
-      CG_DrawBigString( ICON_SIZE + 16, y + (ICON_SIZE/2 - BIGCHAR_HEIGHT/2), bg_itemlist[ value ].pickup_name, fadeColor[0] );
+      //TA: BG_FindHumanNameForWeapon is probably highly inappropriate here, but this will probably never get called
+      CG_DrawBigString( ICON_SIZE + 16, y + (ICON_SIZE/2 - BIGCHAR_HEIGHT/2), BG_FindHumanNameForWeapon( value ), fadeColor[0] );
       trap_R_SetColor( NULL );
     }
   }