valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-09 03:24:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 52a023c4f4 into 0565403b15

Browse source
This commit is contained in:
speedvoltage 2025-04-02 23:17:34 -04:00 committed by GitHub
commit 5dd6e81abb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/game/shared/hl2mp/weapon_ar2.cpp
View file

@ -190,6 +190,16 @@ void CWeaponAR2::DelayedAttack( void )
// Register a muzzleflash for the AI
pOwner->DoMuzzleFlash();
#ifndef CLIENT_DLL
CEffectData data;
data.m_nEntIndex = entindex();
data.m_vOrigin = pOwner->Weapon_ShootPosition();
data.m_nAttachmentIndex = LookupAttachment( "muzzle" );
data.m_flScale = 1.0f;
data.m_fFlags = MUZZLEFLASH_COMBINE;
DispatchEffect( "MuzzleFlash", data );
#endif
WeaponSound( WPN_DOUBLE );
// Fire the bullets
@ -229,10 +239,10 @@ void CWeaponAR2::DelayedAttack( void )
pOwner->RemoveAmmo( 1, m_iSecondaryAmmoType );
// Can shoot again immediately
m_flNextPrimaryAttack = gpGlobals->curtime + 0.5f;
pOwner->m_flNextAttack = gpGlobals->curtime + 0.5f;
// Can blow up after a short delay (so have time to release mouse button)
m_flNextEmptySoundTime = m_flNextSecondaryAttack = gpGlobals->curtime + 1.0f;
m_flNextSecondaryAttack = gpGlobals->curtime + 1.0f;
}
//-----------------------------------------------------------------------------
@ -240,25 +250,26 @@ void CWeaponAR2::DelayedAttack( void )
//-----------------------------------------------------------------------------
void CWeaponAR2::SecondaryAttack( void )
{
CBasePlayer *pOwner = ToBasePlayer( GetOwner() );
if ( pOwner == NULL )
return;
if ( m_bShotDelayed )
return;
CBasePlayer* pPlayer = ToBasePlayer( GetOwner() );
if ( pPlayer == NULL )
return;
// Cannot fire underwater
if ( ( pPlayer->GetAmmoCount( m_iSecondaryAmmoType ) <= 0 ) || ( pPlayer->GetWaterLevel() == 3 ) )
if ( pOwner->GetWaterLevel() == 3 )
{
SendWeaponAnim( ACT_VM_DRYFIRE );
BaseClass::WeaponSound( EMPTY );
m_flNextEmptySoundTime = m_flNextSecondaryAttack = gpGlobals->curtime + 0.5f;
m_flNextSecondaryAttack = gpGlobals->curtime + 0.5f;
return;
}
m_bShotDelayed = true;
m_flNextEmptySoundTime = m_flNextPrimaryAttack = m_flNextSecondaryAttack = m_flDelayedFire = gpGlobals->curtime + 0.5f;
m_flNextPrimaryAttack = m_flDelayedFire = gpGlobals->curtime + 1.0f;
m_flNextSecondaryAttack = m_flDelayedFire = gpGlobals->curtime + 0.5f;
SendWeaponAnim( ACT_VM_FIDGET );
WeaponSound( SPECIAL1 );