diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 11:35:06 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:08 +0000 |
| commit | 78c1339520835153322cc7c803a3bad68bee5ab9 (patch) | |
| tree | b2334291ebf66c74f511117bb7aefcc0866e7823 /src/cgame | |
| parent | 13caf1e9e5b7782cc56ea26d7d4403a192ed31b0 (diff) | |
Lucifer warning sound not played for aliens
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_weapons.c | 9 |
1 files 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 ) { |