Merge pull request #1068 from anf3is/fix/deagle-reload

BenLubar · web-flow · commit 2ded34759caf · 2026-05-21T10:23:41.000-05:00
Bulldog prevent endless reload when holding attack before reloading
diff --git a/src/game/shared/swarm/asw_weapon_deagle_shared.cpp b/src/game/shared/swarm/asw_weapon_deagle_shared.cpp
@@ -70,7 +70,7 @@ void CASW_Weapon_DEagle::ItemPostFrame()
 {
 	CBasePlayer *pOwner = GetCommander();
 
-	if ( !m_bCanShoot && pOwner && !( pOwner->m_afButtonReleased & IN_ATTACK ) && ( pOwner->m_nButtons & IN_ATTACK ) )
+	if ( !m_bInReload && !m_bCanShoot && pOwner && !( pOwner->m_afButtonReleased & IN_ATTACK ) && ( pOwner->m_nButtons & IN_ATTACK ) )
 	{
 		// pretend we're still on cooldown so we don't run the weapon_fire event
 		m_flNextPrimaryAttack = MAX( gpGlobals->curtime + TICK_INTERVAL, m_flNextPrimaryAttack );

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void CASW_Weapon_DEagle::ItemPostFrame()`
`70`	`70`	`{`
`71`	`71`	`CBasePlayer *pOwner = GetCommander();`
`72`	`72`
`73`		`- if ( !m_bCanShoot && pOwner && !( pOwner->m_afButtonReleased & IN_ATTACK ) && ( pOwner->m_nButtons & IN_ATTACK ) )`
	`73`	`+ if ( !m_bInReload && !m_bCanShoot && pOwner && !( pOwner->m_afButtonReleased & IN_ATTACK ) && ( pOwner->m_nButtons & IN_ATTACK ) )`
`74`	`74`	`{`
`75`	`75`	`// pretend we're still on cooldown so we don't run the weapon_fire event`
`76`	`76`	`m_flNextPrimaryAttack = MAX( gpGlobals->curtime + TICK_INTERVAL, m_flNextPrimaryAttack );`