summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
authorBen Millwood <thebenmachine@gmail.com>2009-10-03 12:52:08 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:17 +0000
commiteb9f1d7a0e02993772facc4314a0ba9f62592879 (patch)
tree5ad820d9415d6b7181962453249044d3516f772d /src/cgame
parentfd69c6cdcccfee850fb769ce34883ee7813ab569 (diff)
Zone BP
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_draw.c5
-rw-r--r--src/cgame/cg_local.h6
-rw-r--r--src/cgame/cg_servercmds.c11
3 files changed, 1 insertions, 21 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index e30eed48..b12174f2 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -630,11 +630,8 @@ static void CG_DrawPlayerAmmoValue( rectDef_t *rect, vec4_t color )
case WP_ABUILD:
case WP_ABUILD2:
- value = cgs.alienBuildPoints;
- break;
-
case WP_HBUILD:
- value = cgs.humanBuildPoints;
+ value = cg.snap->ps.persistant[ PERS_BP ];
break;
default:
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 8f26df43..5518a329 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1374,12 +1374,6 @@ typedef struct
qboolean newHud;
- int alienBuildPoints;
- int alienBuildPointsTotal;
- int humanBuildPoints;
- int humanBuildPointsTotal;
- int humanBuildPointsPowered;
-
int alienStage;
int humanStage;
int alienCredits;
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index ae3e179e..2d9b7038 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -160,12 +160,6 @@ Called on load to set the initial values from configure strings
*/
void CG_SetConfigValues( void )
{
- sscanf( CG_ConfigString( CS_BUILDPOINTS ),
- "%d %d %d %d", &cgs.alienBuildPoints,
- &cgs.alienBuildPointsTotal,
- &cgs.humanBuildPoints,
- &cgs.humanBuildPointsTotal );
-
sscanf( CG_ConfigString( CS_STAGES ), "%d %d %d %d %d %d", &cgs.alienStage, &cgs.humanStage,
&cgs.alienCredits, &cgs.humanCredits, &cgs.alienNextStageThreshold, &cgs.humanNextStageThreshold );
@@ -279,11 +273,6 @@ static void CG_ConfigStringModified( void )
CG_ParseServerinfo( );
else if( num == CS_WARMUP )
CG_ParseWarmup( );
- else if( num == CS_BUILDPOINTS )
- sscanf( str, "%d %d %d %d", &cgs.alienBuildPoints,
- &cgs.alienBuildPointsTotal,
- &cgs.humanBuildPoints,
- &cgs.humanBuildPointsTotal );
else if( num == CS_STAGES )
{
stage_t oldAlienStage = cgs.alienStage;