Skip to content

Add missing "out of ammo" notifications #1053

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 2 commits into from
May 19, 2026
Merged

Add missing "out of ammo" notifications #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc95f6d
fix(attack): notify if flamer has no ammo after secondary attack
anf3is May 9, 2026
1661414
fix(attack): notify if tesla gun has no ammo after any attack
anf3is May 9, 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
1 change: 1 addition & 0 deletions src/game/shared/swarm/asw_weapon_flamer_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ void CASW_Weapon_Flamer::SecondaryAttack( void )
{
// decrement ammo
m_iClip1 -= 2;
NotifyIfNoneClip1Ammo( pMarine );
}
}
if (!rd_flamer_infinite_extinguisher.GetBool() || m_iClip1 > 0) // only force the fire wait time if we have ammo for another shot
Expand Down
4 changes: 2 additions & 2 deletions src/game/shared/swarm/asw_weapon_tesla_gun_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ void CASW_Weapon_Tesla_Gun::PrimaryAttack( void )
{
m_iClip1 = MAX( 0, m_iClip1 - 1 );
m_flLastDischargeTime = gpGlobals->curtime;
NotifyIfNoneClip1Ammo( pMarine );
}

m_flNextPrimaryAttack = gpGlobals->curtime;
Expand Down Expand Up @@ -325,6 +326,7 @@ void CASW_Weapon_Tesla_Gun::ShockEntity()

// decrement ammo
m_iClip1 = MAX( 0, m_iClip1 - 1 );
NotifyIfNoneClip1Ammo( pMarine );

CPASFilter filter( pShockBaseEntity->GetAbsOrigin() );
CBaseEntity::EmitSound( filter, SOUND_FROM_WORLD, "ASW_Tesla_Laser.Damage", &pShockBaseEntity->GetAbsOrigin() );
Expand Down Expand Up @@ -489,8 +491,6 @@ void CASW_Weapon_Tesla_Gun::Fire( const Vector &vecOrigSrc, const Vector &vecDir
SetFiringState( ASW_TG_FIRE_DISCHARGE );
}

NotifyIfNoneClip1Ammo( pMarine );

if ( tr.DidHit() )
{
vecDest = tr.endpos;
Expand Down
Loading