* Remove unused references to bank

* Remove cg_drawStatus as it's pretty much unused, too

5 files changed, 5 insertions, 43 deletions

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 82d0aff2..fbdc747b 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -340,27 +340,6 @@ static void CG_DrawPlayerCreditsValue( rectDef_t *rect, vec4_t color, qboolean p
   }
 }
 
-static void CG_DrawPlayerBankValue( rectDef_t *rect, vec4_t color, qboolean padding )
-{
-  int           value;
-  playerState_t *ps;
-
-  ps = &cg.snap->ps;
-
-  value = ps->persistant[ PERS_BANK ];
-  if( value > -1 )
-  {
-    trap_R_SetColor( color );
-
-    if( padding )
-      CG_DrawFieldPadded( rect->x, rect->y, 4, rect->w / 4, rect->h, value );
-    else
-      CG_DrawField( rect->x, rect->y, 1, rect->w, rect->h, value );
-
-    trap_R_SetColor( NULL );
-  }
-}
-
 #define HH_MIN_ALPHA  0.2f
 #define HH_MAX_ALPHA  0.8f
 #define HH_ALPHA_DIFF (HH_MAX_ALPHA-HH_MIN_ALPHA)
@@ -2323,9 +2302,6 @@ void CG_OwnerDraw( float x, float y, float w, float h, float text_x,
 {
   rectDef_t rect;
 
-  if( cg_drawStatus.integer == 0 )
-    return;
-
   rect.x = x;
   rect.y = y;
   rect.w = w;
@@ -2336,15 +2312,9 @@ void CG_OwnerDraw( float x, float y, float w, float h, float text_x,
     case CG_PLAYER_CREDITS_VALUE:
       CG_DrawPlayerCreditsValue( &rect, color, qtrue );
       break;
-    case CG_PLAYER_BANK_VALUE:
-      CG_DrawPlayerBankValue( &rect, color, qtrue );
-      break;
     case CG_PLAYER_CREDITS_VALUE_NOPAD:
       CG_DrawPlayerCreditsValue( &rect, color, qfalse );
       break;
-    case CG_PLAYER_BANK_VALUE_NOPAD:
-      CG_DrawPlayerBankValue( &rect, color, qfalse );
-      break;
     case CG_PLAYER_STAMINA_1:
       CG_DrawPlayerStamina1( &rect, color, shader );
       break;
@@ -2908,8 +2878,7 @@ CG_DrawIntermission
 */
 static void CG_DrawIntermission( void )
 {
-  if( cg_drawStatus.integer )
-    Menu_Paint( Menus_FindByName( "default_hud" ), qtrue );
+  Menu_Paint( Menus_FindByName( "default_hud" ), qtrue );
 
   cg.scoreFadeTime = cg.time;
   cg.scoreBoardShowing = CG_DrawScoreboard( );
@@ -3045,12 +3014,9 @@ static void CG_Draw2D( void )
       ( cg.snap->ps.stats[ STAT_HEALTH ] > 0 ) )
   {
     CG_DrawBuildableStatus( );
-    if( cg_drawStatus.integer )
-      Menu_Paint( menu, qtrue );
-
   }
-  else if( cg_drawStatus.integer )
-    Menu_Paint( defaultMenu, qtrue );
+
+  Menu_Paint( menu, qtrue );
 
   CG_DrawVote( );
   CG_DrawTeamVote( );
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 4a1f8a7e..89e86935 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1460,7 +1460,6 @@ extern  vmCvar_t    cg_drawCrosshair;
 extern  vmCvar_t    cg_drawCrosshairNames;
 extern  vmCvar_t    cg_crosshairSize;
 extern  vmCvar_t    cg_draw2D;
-extern  vmCvar_t    cg_drawStatus;
 extern  vmCvar_t    cg_animSpeed;
 extern  vmCvar_t    cg_debugAnim;
 extern  vmCvar_t    cg_debugPosition;
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index deb19580..3bca625d 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -118,7 +118,6 @@ vmCvar_t  cg_drawCrosshair;
 vmCvar_t  cg_drawCrosshairNames;
 vmCvar_t  cg_crosshairSize;
 vmCvar_t  cg_draw2D;
-vmCvar_t  cg_drawStatus;
 vmCvar_t  cg_animSpeed;
 vmCvar_t  cg_debugAnim;
 vmCvar_t  cg_debugPosition;
@@ -233,7 +232,6 @@ static cvarTable_t cvarTable[ ] =
   { &cg_stereoSeparation, "cg_stereoSeparation", "0.4", CVAR_ARCHIVE  },
   { &cg_shadows, "cg_shadows", "1", CVAR_ARCHIVE  },
   { &cg_draw2D, "cg_draw2D", "1", CVAR_ARCHIVE  },
-  { &cg_drawStatus, "cg_drawStatus", "1", CVAR_ARCHIVE  },
   { &cg_drawTimer, "cg_drawTimer", "1", CVAR_ARCHIVE  },
   { &cg_drawClock, "cg_drawClock", "0", CVAR_ARCHIVE  },
   { &cg_drawFPS, "cg_drawFPS", "1", CVAR_ARCHIVE  },
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 2c0d1b31..57803a24 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -223,6 +223,7 @@ typedef enum
   STAT_BUILDABLE, // which ghost model to display for building
   STAT_FALLDIST,  // the distance the player fell
   STAT_VIEWLOCK   // direction to lock the view in
+  // netcode has space for 3 more
 } statIndex_t;
 
 #define SCA_WALLCLIMBER         0x00000001
@@ -267,9 +268,9 @@ typedef enum
 
   PERS_STATE,
   PERS_CREDIT,    // human credit
-  PERS_BANK,      // human credit in the bank
   PERS_QUEUEPOS,  // position in the spawn queue
   PERS_NEWWEAPON  // weapon to switch to
+  // netcode has space for 5 more
 } persEnum_t;
 
 #define PS_WALLCLIMBINGFOLLOW   0x00000001
diff --git a/ui/menudef.h b/ui/menudef.h
index 6290cf42..f324c046 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -100,9 +100,7 @@
 #define CG_PLAYER_CLIPS_VALUE             3
 #define CG_PLAYER_BUILD_TIMER             4
 #define CG_PLAYER_CREDITS_VALUE           7
-#define CG_PLAYER_BANK_VALUE              8
 #define CG_PLAYER_CREDITS_VALUE_NOPAD     9
-#define CG_PLAYER_BANK_VALUE_NOPAD        10
 #define CG_PLAYER_STAMINA                 11
 #define CG_PLAYER_STAMINA_1               12
 #define CG_PLAYER_STAMINA_2               13