Don't discard ammo on the Force-a-Nature if the clip size is full

num-get · num-get · commit 491b55a020e5 · 2025-11-18T19:21:15.000+08:00
diff --git a/src/game/shared/tf/tf_weapon_shotgun.cpp b/src/game/shared/tf/tf_weapon_shotgun.cpp
@@ -417,7 +417,7 @@ void CTFScatterGun::FinishReload( void )
 	if ( !pOwner )
 		return;
 
-	if ( UsesClipsForAmmo1() && !m_bReloadsSingly )
+	if ( UsesClipsForAmmo1() && !m_bReloadsSingly && m_iClip1 < GetMaxClip1() )
 	{
 		int primary	= MIN( GetMaxClip1() - m_iClip1, pOwner->GetAmmoCount(m_iPrimaryAmmoType));	
 		m_iClip1 += primary;

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ void CTFScatterGun::FinishReload( void )`
`417`	`417`	`if ( !pOwner )`
`418`	`418`	`return;`
`419`	`419`
`420`		`- if ( UsesClipsForAmmo1() && !m_bReloadsSingly )`
	`420`	`+ if ( UsesClipsForAmmo1() && !m_bReloadsSingly && m_iClip1 < GetMaxClip1() )`
`421`	`421`	`{`
`422`	`422`	`int primary = MIN( GetMaxClip1() - m_iClip1, pOwner->GetAmmoCount(m_iPrimaryAmmoType));`
`423`	`423`	`m_iClip1 += primary;`