mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-02-03 02:24:28 +00:00
Merge 3e2f7e1e81
This commit is contained in:
parent
9bb5cb2f05
commit
3ad3004dd9
@ -392,13 +392,13 @@ void CController::UpdateOnRemove()
|
||||
if( m_pBall[0] )
|
||||
{
|
||||
UTIL_Remove( m_pBall[0] );
|
||||
m_pBall[0] = nullptr;
|
||||
m_pBall[0] = 0;
|
||||
}
|
||||
|
||||
if( m_pBall[1] )
|
||||
{
|
||||
UTIL_Remove( m_pBall[1] );
|
||||
m_pBall[1] = nullptr;
|
||||
m_pBall[1] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -139,8 +139,10 @@ void CCrowbar::PrimaryAttack()
|
||||
{
|
||||
if( !Swing( 1 ) )
|
||||
{
|
||||
#ifndef CLIENT_DLL
|
||||
SetThink( &CCrowbar::SwingAgain );
|
||||
pev->nextthink = gpGlobals->time + 0.1;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -301,11 +303,11 @@ int CCrowbar::Swing( int fFirst )
|
||||
}
|
||||
|
||||
m_pPlayer->m_iWeaponVolume = (int)( flVol * CROWBAR_WALLHIT_VOLUME );
|
||||
#endif
|
||||
m_flNextPrimaryAttack = GetNextAttackDelay( 0.25 );
|
||||
|
||||
SetThink( &CCrowbar::Smack );
|
||||
pev->nextthink = UTIL_WeaponTimeBase() + 0.2;
|
||||
#endif
|
||||
m_flNextPrimaryAttack = GetNextAttackDelay( 0.25 );
|
||||
}
|
||||
return fDidHit;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user