q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-21 19:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make power-up line up on status bar

Browse source
This commit is contained in:
Zack Middleton 2024-01-21 17:00:16 -06:00
parent 67c0b325ec
commit b2d893a31b
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
engine/code/cgame/cg_draw.c
View file

@ -42,6 +42,8 @@ char systemChat[256];
char teamChat1[256]; char teamChat1[256];
char teamChat2[256]; char teamChat2[256];
static void CG_DrawRallyPowerups( void );
#ifdef MISSIONPACK #ifdef MISSIONPACK
int CG_Text_Width(const char *text, float scale, int limit) { int CG_Text_Width(const char *text, float scale, int limit) {
@ -838,6 +840,8 @@ static void CG_DrawRallyStatusBar( void ) {
healthModel, 0, origin, angles ); healthModel, 0, origin, angles );
} }
CG_DrawRallyPowerups();
if (cg.predictedPlayerState.powerups[PW_REDFLAG]) if (cg.predictedPlayerState.powerups[PW_REDFLAG])
CG_DrawStatusBarFlag( 495, TEAM_RED); CG_DrawStatusBarFlag( 495, TEAM_RED);
else if (cg.predictedPlayerState.powerups[PW_BLUEFLAG]) else if (cg.predictedPlayerState.powerups[PW_BLUEFLAG])
@ -1093,7 +1097,7 @@ static float CG_DrawPowerups( float y ) {
CG_DrawRallyPowerups CG_DrawRallyPowerups
==================== ====================
*/ */
static float CG_DrawRallyPowerups( float y ) { static void CG_DrawRallyPowerups( void ) {
int sorted[MAX_POWERUPS]; int sorted[MAX_POWERUPS];
int sortedTime[MAX_POWERUPS]; int sortedTime[MAX_POWERUPS];
int i, j, k; int i, j, k;
@ -1114,7 +1118,7 @@ static float CG_DrawRallyPowerups( float y ) {
ps = &cg.snap->ps; ps = &cg.snap->ps;
if ( ps->stats[STAT_HEALTH] <= 0 ) { if ( ps->stats[STAT_HEALTH] <= 0 ) {
return y; return;
} }
switch (cgs.clientinfo[cg.snap->ps.clientNum].team){ switch (cgs.clientinfo[cg.snap->ps.clientNum].team){
@ -1181,10 +1185,10 @@ static float CG_DrawRallyPowerups( float y ) {
color = 1; color = 1;
CG_FillRect( 402, 476 - 28, 90, 24, bg_color ); CG_FillRect( 402, 476 - 30, 90, 24, bg_color );
trap_R_SetColor( colors[color] ); trap_R_SetColor( colors[color] );
CG_DrawField( 424 + CHAR_WIDTH, 476 - 26, 2, sortedTime[ i ] / 1000 ); CG_DrawField( 424 + CHAR_WIDTH, 476 - 28, 2, sortedTime[ i ] / 1000 );
t = ps->powerups[ sorted[i] ]; t = ps->powerups[ sorted[i] ];
if ( t - cg.time >= POWERUP_BLINKS * POWERUP_BLINK_TIME ) { if ( t - cg.time >= POWERUP_BLINKS * POWERUP_BLINK_TIME ) {
@ -1211,13 +1215,9 @@ static float CG_DrawRallyPowerups( float y ) {
size = 19; size = 19;
} }
CG_DrawPic( 408, 476 - 25, size, size, trap_R_RegisterShader( item->icon ) ); CG_DrawPic( 408, 476 - 27, size, size, trap_R_RegisterShader( item->icon ) );
// y -= 36;
} }
trap_R_SetColor( NULL ); trap_R_SetColor( NULL );
return y;
} }
#endif // MISSIONPACK #endif // MISSIONPACK
// Q3Rally Code END // Q3Rally Code END
@ -1846,8 +1846,6 @@ static void CG_DrawLowerRight( void ) {
if ( isRaceObserver( cg.snap->ps.clientNum ) ) if ( isRaceObserver( cg.snap->ps.clientNum ) )
return; return;
CG_DrawRallyPowerups( 476 );
y = CG_DrawLowerRightHUD( y ); y = CG_DrawLowerRightHUD( y );
if ( cgs.gametype >= GT_TEAM && cg_drawTeamOverlay.integer == 2 ) { if ( cgs.gametype >= GT_TEAM && cg_drawTeamOverlay.integer == 2 ) {