allow auto reload to start while fire delay is active (manual reload …

…can already do this) and while the primary fire button is held. fixes #801.
ReactiveDrop · Oct 9, 2024 · 9874d4f · 9874d4f
1 parent c7ee37e
commit 9874d4f
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/game/shared/swarm/asw_weapon_shared.cpp b/src/game/shared/swarm/asw_weapon_shared.cpp
@@ -549,7 +549,7 @@ void CASW_Weapon::ItemPostFrame( void )
 	// -----------------------
 	//  No buttons down
 	// -----------------------
-	if ( !( bAttack1 || bAttack2 || bReload ) )
+	if ( !( /*bAttack1 ||*/ bAttack2 || bReload ) )
 	{
 		// no fire buttons down or reloading
 		if ( !ReloadOrSwitchWeapons() && ( m_bInReload == false ) )
@@ -609,8 +609,6 @@ bool CASW_Weapon::ReloadOrSwitchWeapons( void )
 		( m_iClip1 == 0 ) &&
 		( GetWeaponFlags() & ITEM_FLAG_NOAUTORELOAD ) == false &&
 		bAutoReload &&
-		m_flNextPrimaryAttack < gpGlobals->curtime &&
-		( ( m_flNextSecondaryAttack < gpGlobals->curtime ) || !HasSecondaryAttack() ) &&
 		!m_bInReload )
 	{
 		// if we're successfully reloading, we're done