FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply crowbar fixes to knife (#314)

This commit is contained in:
Roman Chistokhodov 2022-08-08 03:00:07 +03:00 committed by GitHub
parent 543e391223
commit 778d4b11af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/gearbox/knife.cpp
View File

@ -164,7 +164,9 @@ int CKnife::Swing(int fFirst)
{
// miss
m_flNextPrimaryAttack = GetNextAttackDelay(0.5);
#if CROWBAR_IDLE_ANIM
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
#endif
// player "shoot" animation
m_pPlayer->SetAnimation(PLAYER_ATTACK1);
}
@ -276,7 +278,44 @@ int CKnife::Swing(int fFirst)
SetThink(&CKnife::Smack);
pev->nextthink = UTIL_WeaponTimeBase() + 0.2;
#endif
m_flNextPrimaryAttack = GetNextAttackDelay(0.25);
#if CROWBAR_DELAY_FIX
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f;
#else
m_flNextPrimaryAttack = GetNextAttackDelay( 0.25f );
#endif
}
#if CROWBAR_IDLE_ANIM
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
#endif
return fDidHit;
}
#if CROWBAR_IDLE_ANIM
void CKnife::WeaponIdle( void )
{
if( m_flTimeWeaponIdle < UTIL_WeaponTimeBase() )
{
int iAnim;
float flRand = UTIL_SharedRandomFloat( m_pPlayer->random_seed, 0, 1 );
if( flRand > 0.9f )
{
iAnim = KNIFE_IDLE2;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0f / 30.0f;
}
else
{
if( flRand > 0.5f )
{
iAnim = KNIFE_IDLE1;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 70.0f / 25.0f;
}
else
{
iAnim = KNIFE_IDLE3;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 160.0f / 30.0f;
}
}
SendWeaponAnim( iAnim );
}
}
#endif

3
dlls/weapons.h
View File

@ -1210,6 +1210,9 @@ public:
int Swing(int fFirst);
BOOL Deploy(void);
void Holster(int skiplocal = 0);
#if CROWBAR_IDLE_ANIM
void WeaponIdle();
#endif
int m_iSwing;
TraceResult m_trHit;