From 78c1339520835153322cc7c803a3bad68bee5ab9 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 11:35:06 +0000 Subject: Lucifer warning sound not played for aliens --- src/cgame/cg_weapons.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 63455c16..f6866bc2 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -868,12 +868,15 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent trap_S_AddLoopingSound( cent->currentState.number, cent->lerpOrigin, vec3_origin, weapon->readySound ); } - // Lucifer cannon charge warning beep - if( weaponNum == WP_LUCIFER_CANNON && - ( cent->currentState.eFlags & EF_WARN_CHARGE ) ) + // Lucifer cannon charge warning beep + if( weaponNum == WP_LUCIFER_CANNON && + ( cent->currentState.eFlags & EF_WARN_CHARGE ) && + cg.snap->ps.stats[ STAT_PTEAM ] != PTE_ALIENS ) + { trap_S_AddLoopingSound( cent->currentState.number, cent->lerpOrigin, vec3_origin, ps ? cgs.media.lCannonWarningSound : cgs.media.lCannonWarningSound2 ); + } if( !noGunModel ) { -- cgit