Skip to content

Revert "Prevent reload of heal and amp ammo of various healguns"#1065

Merged
BenLubar merged 1 commit into
ReactiveDrop:reactivedrop_betafrom
anf3is:revert-1063-fix/healguns-reload
May 19, 2026
Merged

Revert "Prevent reload of heal and amp ammo of various healguns"#1065
BenLubar merged 1 commit into
ReactiveDrop:reactivedrop_betafrom
anf3is:revert-1063-fix/healguns-reload

Conversation

@anf3is
Copy link
Copy Markdown
Contributor

@anf3is anf3is commented May 19, 2026

Reverts #1063

Ok, this need to be reverted because apparently it breaks CBaseCombatWeapon::GiveDefaultAmmo and makes map healguns spawn without heal ammo 🤯

And healamp gun's original UsesClipsForAmmo2 does not do anything because it does not match signature of parents.

void CBaseCombatWeapon::GiveDefaultAmmo( void )
{
// If I use clips, set my clips to the default
if ( UsesClipsForAmmo1() )
{
m_iClip1 = GetDefaultClip1();
}
else
{
SetPrimaryAmmoCount( GetDefaultClip1() );
m_iClip1 = WEAPON_NOCLIP;
}
if ( UsesClipsForAmmo2() )
{
m_iClip2 = GetDefaultClip2();
}
else
{
SetSecondaryAmmoCount( GetDefaultClip2() );
m_iClip2 = WEAPON_NOCLIP;
}
}

@BenLubar BenLubar merged commit 1b25b76 into ReactiveDrop:reactivedrop_beta May 19, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants