Skip to content

Prevent reloading when current ammo exceeds clip size #1067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenLubar merged 3 commits into from
May 21, 2026
+8 −10
Merged

Prevent reloading when current ammo exceeds clip size #1067

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f904563
fix(asw_weapon): prevent reloading when current ammo exceeds clip size
anf3is May 19, 2026
105e2fc
fix(asw_weapon): prevent finish reloading when current ammo exceeds c…
anf3is May 19, 2026
9f98943
refactor(asw_weapon): clarify reload condition
anf3is May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/game/shared/swarm/asw_weapon_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,8 +901,7 @@ bool CASW_Weapon::ASWReload( int iClipSize1, int iClipSize2, int iActivity )
if ( UsesClipsForAmmo1() )
{
// need to reload primary clip?
int primary = MIN( iClipSize1 - m_iClip1, pMarine->GetAmmoCount( m_iPrimaryAmmoType ) );
if ( primary != 0 )
if ( m_iClip1 < iClipSize1 && pMarine->GetAmmoCount( m_iPrimaryAmmoType ) > 0 )
{
bReload = true;
}
Expand All @@ -929,8 +928,7 @@ bool CASW_Weapon::ASWReload( int iClipSize1, int iClipSize2, int iActivity )
pAmmoBag->GiveClipTo( pMarine, m_iPrimaryAmmoType, true );

// now we've given a clip, check if we can reload
primary = MIN( iClipSize1 - m_iClip1, pMarine->GetAmmoCount( m_iPrimaryAmmoType ) );
if ( primary != 0 )
if ( m_iClip1 < iClipSize1 && pMarine->GetAmmoCount( m_iPrimaryAmmoType ) > 0 )
{
bReload = true;
}
Expand All @@ -942,8 +940,7 @@ bool CASW_Weapon::ASWReload( int iClipSize1, int iClipSize2, int iActivity )
if ( UsesClipsForAmmo2() )
{
// need to reload secondary clip?
int secondary = MIN( iClipSize2 - m_iClip2, pMarine->GetAmmoCount( m_iSecondaryAmmoType ) );
if ( secondary != 0 )
if ( m_iClip2 < iClipSize2 && pMarine->GetAmmoCount( m_iSecondaryAmmoType ) > 0 )
{
bReload = true;
}
Expand Down Expand Up @@ -1199,8 +1196,9 @@ void CASW_Weapon::FinishReload( void )

if (pOwner)
{
// If I use primary clips, reload primary
if ( UsesClipsForAmmo1() )
// Additional checks are needed to prevent accidentally reloading ammo types that don't require reloading now.
// If I use primary clips, current clip not overflowing and I have spare ammo, reload primary
if ( UsesClipsForAmmo1() && m_iClip1 < GetMaxClip1() && pOwner->GetAmmoCount(m_iPrimaryAmmoType) > 0 )
{
// asw: throw away what's in the clip currently
m_iClip1 = 0;
Expand All @@ -1209,8 +1207,8 @@ void CASW_Weapon::FinishReload( void )
pOwner->RemoveAmmo( primary, m_iPrimaryAmmoType);
}

// If I use secondary clips, reload secondary
if ( UsesClipsForAmmo2() )
// If I use secondary clips, current clip not overflowing and I have spare ammo, reload secondary
if ( UsesClipsForAmmo2() && m_iClip2 < GetMaxClip2() && pOwner->GetAmmoCount(m_iSecondaryAmmoType) > 0 )
{
int secondary = MIN( GetMaxClip2() - m_iClip2, pOwner->GetAmmoCount(m_iSecondaryAmmoType));
m_iClip2 += secondary;
Expand Down
Loading