q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-17 01:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disable permanent 'out of ammo' message in Derby

Browse source 
In Derby, weapons don't spawn and player's only start with Gauntlet.
This commit is contained in:
Zack Middleton 2023-12-27 17:06:00 -06:00
parent 89c4886605
commit 4745f36e47
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2903,7 +2903,7 @@ static void CG_DrawAmmoWarning( void ) {
int w; int w;
// Q3Rally Code Start // Q3Rally Code Start
if (isRallyNonDMRace()){ if (isRallyNonDMRace() || cgs.gametype == GT_DERBY){
return; return;
} }
// Q3Rally Code END // Q3Rally Code END

8
engine/code/cgame/cg_playerstate.c
View file

@ -36,6 +36,14 @@ void CG_CheckAmmo( void ) {
int previous; int previous;
int weapons; int weapons;
// Q3Rally Code Start
if ( cg.snap->ps.weapon == WP_NONE ||
cg.snap->ps.weapon == WP_GAUNTLET ) {
cg.lowAmmoWarning = 0;
return;
}
// Q3Rally Code END
// see about how many seconds of ammo we have remaining // see about how many seconds of ammo we have remaining
weapons = cg.snap->ps.stats[ STAT_WEAPONS ]; weapons = cg.snap->ps.stats[ STAT_WEAPONS ];
total = 0; total = 0;