H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-08-08 01:39:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add source-sdk-2013

Browse Source
This commit is contained in:
nillerusr
2022-03-01 23:00:42 +03:00
parent 88b8830e8b
commit edc8d6c584
3288 changed files with 3731 additions and 1062455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/shared/basecombatcharacter_shared.cpp
+1 -16
View File
@@ -90,23 +90,8 @@ bool CBaseCombatCharacter::Weapon_CanSwitchTo( CBaseCombatWeapon *pWeapon )
if ( m_hActiveWeapon )
{
if ( !m_hActiveWeapon->CanHolster() && !pWeapon->ForceWeaponSwitch() )
if ( !m_hActiveWeapon->CanHolster() )
return false;
if ( IsPlayer() )
{
CBasePlayer *pPlayer = (CBasePlayer *)this;
// check if active weapon force the last weapon to switch
if ( m_hActiveWeapon->ForceWeaponSwitch() )
{
// last weapon wasn't allowed to switch, don't allow to switch to new weapon
CBaseCombatWeapon *pLastWeapon = pPlayer->GetLastWeapon();
if ( pLastWeapon && pWeapon != pLastWeapon && !pLastWeapon->CanHolster() && !pWeapon->ForceWeaponSwitch() )
{
return false;
}
}
}
}
return true;