We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 6cc2937 commit b49548aCopy full SHA for b49548a
1 file changed
sp/src/game/shared/hl2/basehlcombatweapon_shared.cpp
@@ -67,6 +67,16 @@ void CBaseHLCombatWeapon::ItemHolsterFrame( void )
67
if ( GetOwner()->GetActiveWeapon() == this )
68
return;
69
70
+#ifdef MAPBASE
71
+ if ( GetOwner()->GetActiveWeapon() )
72
+ {
73
+ // Player can't be holding another weapon that shares our ammo
74
+ CBaseCombatWeapon *pWeapon = GetOwner()->GetActiveWeapon();
75
+ if ( pWeapon->m_iPrimaryAmmoType == m_iPrimaryAmmoType || pWeapon->m_iSecondaryAmmoType == m_iSecondaryAmmoType )
76
+ return;
77
+ }
78
+#endif
79
+
80
// If it's been longer than three seconds, reload
81
if ( ( gpGlobals->curtime - m_flHolsterTime ) > sk_auto_reload_time.GetFloat() )
82
{
0 commit comments