Fix holding +attack2 disallowing certain weapons from firing

- Affected all weapons without clips (melee, autorifle, etc)
fortressforever · Sep 11, 2016 · 6e50824 · 6e50824
1 parent f783252
commit 6e50824
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/game_shared/ff/ff_weapon_base.cpp b/game_shared/ff/ff_weapon_base.cpp
@@ -595,7 +595,7 @@ void CFFWeaponBase::ItemPostFrame()
 	bool bFired = false;
 
 	// Secondary attack has priority
-	if ((pOwner->m_nButtons & IN_ATTACK2) && (m_flNextSecondaryAttack <= gpGlobals->curtime))
+	if (HasAltFire() && (pOwner->m_nButtons & IN_ATTACK2) && (m_flNextSecondaryAttack <= gpGlobals->curtime))
 	{
 		if (UsesSecondaryAmmo() && pOwner->GetAmmoCount(m_iSecondaryAmmoType) <=0)
 		{

diff --git a/game_shared/ff/ff_weapon_base.h b/game_shared/ff/ff_weapon_base.h
@@ -203,6 +203,7 @@ class CFFWeaponBase : public CBaseCombatWeapon
 
 	// All FF weapons are predicted
 	virtual bool		IsPredicted() const { return true; }
+	virtual bool		HasAltFire() const { return false; }
 
 	// All predicted weapons need to implement and return true
 	virtual FFWeaponID	GetWeaponID() const { AssertMsg(0, "GetWeaponID() not defined for weapon"); return FF_WEAPON_NONE; }