valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 19:12:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge d243355c31 into 0565403b15

Browse source
This commit is contained in:
FlaminSarge 2025-04-04 00:44:36 -07:00 committed by GitHub
commit 287a2edb36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/game/shared/tf/tf_weapon_shotgun.cpp
View file

@ -440,61 +440,6 @@ bool CTFScatterGun::HasKnockback( void )
return false;
}
//-----------------------------------------------------------------------------
// Purpose: Play animation appropriate to ball status.
//-----------------------------------------------------------------------------
bool CTFScatterGun::SendWeaponAnim( int iActivity )
{
CTFPlayer *pPlayer = GetTFPlayerOwner();
if ( !pPlayer )
return BaseClass::SendWeaponAnim( iActivity );
if ( HasKnockback() )
{
// Knockback version uses a different model and animation set.
switch ( iActivity )
{
case ACT_VM_DRAW:
iActivity = ACT_ITEM2_VM_DRAW;
break;
case ACT_VM_HOLSTER:
iActivity = ACT_ITEM2_VM_HOLSTER;
break;
case ACT_VM_IDLE:
iActivity = ACT_ITEM2_VM_IDLE;
break;
case ACT_VM_PULLBACK:
iActivity = ACT_ITEM2_VM_PULLBACK;
break;
case ACT_VM_PRIMARYATTACK:
iActivity = ACT_ITEM2_VM_PRIMARYATTACK;
break;
case ACT_VM_SECONDARYATTACK:
iActivity = ACT_ITEM2_VM_SECONDARYATTACK;
break;
case ACT_VM_RELOAD:
iActivity = ACT_ITEM2_VM_RELOAD;
break;
case ACT_VM_DRYFIRE:
iActivity = ACT_ITEM2_VM_DRYFIRE;
break;
case ACT_VM_IDLE_TO_LOWERED:
iActivity = ACT_ITEM2_VM_IDLE_TO_LOWERED;
break;
case ACT_VM_IDLE_LOWERED:
iActivity = ACT_ITEM2_VM_IDLE_LOWERED;
break;
case ACT_VM_LOWERED_TO_IDLE:
iActivity = ACT_ITEM2_VM_LOWERED_TO_IDLE;
break;
default:
break;
}
}
return BaseClass::SendWeaponAnim( iActivity );
}
#ifdef GAME_DLL
//-----------------------------------------------------------------------------
void CTFScatterGun::Equip( CBaseCombatCharacter *pOwner )

1
src/game/shared/tf/tf_weapon_shotgun.h
View file

@ -114,7 +114,6 @@ public:
virtual void ApplyPostHitEffects( const CTakeDamageInfo &inputInfo, CTFPlayer *pPlayer );
virtual void FinishReload( void );
virtual bool HasKnockback( void );
virtual bool SendWeaponAnim( int iActivity );
#ifdef GAME_DLL
virtual void Equip( CBaseCombatCharacter *pOwner );