diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_local.h | 6 | ||||
| -rw-r--r-- | src/cgame/cg_servercmds.c | 15 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index cf25dda4..534aa705 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -968,7 +968,7 @@ static float CG_DrawPoints( float y ) team = cg.snap->ps.stats[ STAT_PTEAM ]; if( team == PTE_DROIDS ) - buildpoints = cgs.aBuildPoints; + buildpoints = cgs.dBuildPoints; else if( team == PTE_HUMANS ) buildpoints = cgs.hBuildPoints; diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 886fb16a..883c7ef7 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -992,7 +992,11 @@ typedef struct { qboolean newHud; - int hBuildPoints, aBuildPoints; + int dBuildPoints; + int dBuildPointsTotal; + int hBuildPoints; + int hBuildPointsTotal; + int hBuildPointsPowered; // // locally derived information from gamestate diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index 28acc0cc..e3a68917 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -189,8 +189,11 @@ void CG_SetConfigValues( void ) { cgs.scores1 = atoi( CG_ConfigString( CS_SCORES1 ) ); cgs.scores2 = atoi( CG_ConfigString( CS_SCORES2 ) ); - cgs.aBuildPoints = atoi( CG_ConfigString( CS_ABPOINTS ) ); + cgs.dBuildPoints = atoi( CG_ConfigString( CS_DBPOINTS ) ); + cgs.dBuildPointsTotal = atoi( CG_ConfigString( CS_DTBPOINTS ) ); cgs.hBuildPoints = atoi( CG_ConfigString( CS_HBPOINTS ) ); + cgs.hBuildPointsTotal = atoi( CG_ConfigString( CS_HTBPOINTS ) ); + cgs.hBuildPointsPowered = atoi( CG_ConfigString( CS_HPBPOINTS ) ); cgs.levelStartTime = atoi( CG_ConfigString( CS_LEVEL_START_TIME ) ); if( cgs.gametype == GT_CTF ) { @@ -273,10 +276,16 @@ static void CG_ConfigStringModified( void ) { cgs.scores1 = atoi( str ); } else if ( num == CS_SCORES2 ) { cgs.scores2 = atoi( str ); - } else if ( num == CS_ABPOINTS ) { - cgs.aBuildPoints = atoi( str ); + } else if ( num == CS_DBPOINTS ) { + cgs.dBuildPoints = atoi( str ); + } else if ( num == CS_DTBPOINTS ) { + cgs.dBuildPointsTotal = atoi( str ); } else if ( num == CS_HBPOINTS ) { cgs.hBuildPoints = atoi( str ); + } else if ( num == CS_HTBPOINTS ) { + cgs.hBuildPointsTotal = atoi( str ); + } else if ( num == CS_HPBPOINTS ) { + cgs.hBuildPointsPowered = atoi( str ); } else if ( num == CS_LEVEL_START_TIME ) { cgs.levelStartTime = atoi( str ); } else if ( num == CS_VOTE_TIME ) { |