Skip to content

Fix sound pool starvation for very rapid gunfire #1524

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
Rainyan merged 1 commit into from
Nov 29, 2025
Merged

Fix sound pool starvation for very rapid gunfire #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/game/shared/baseentity_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,8 +1951,14 @@ void CBaseEntity::FireBullets( const FireBulletsInfo_t &info )
#ifdef GAME_DLL
UpdateShotStatistics( tr );

#ifdef NEO
const int soundEntChannel = (info.m_nFlags & FIRE_BULLETS_TEMPORARY_DANGER_SOUND)
? SOUNDENT_CHANNEL_BULLET_IMPACT
: (neoWeapon->IsAutomatic() ? SOUNDENT_CHANNEL_REPEATING : SOUNDENT_CHANNEL_WEAPON);
#else
// For shots that don't need persistance
int soundEntChannel = ( info.m_nFlags&FIRE_BULLETS_TEMPORARY_DANGER_SOUND ) ? SOUNDENT_CHANNEL_BULLET_IMPACT : SOUNDENT_CHANNEL_UNSPECIFIED;
#endif

CSoundEnt::InsertSound( SOUND_BULLET_IMPACT, tr.endpos, 200, 0.5, this, soundEntChannel );
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/game/shared/neo/weapons/weapon_neobasecombatweapon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class CNEOBaseCombatWeapon : public CBaseHL2MPCombatWeapon
int GetNumShotsFired(void) const { return m_nNumShotsFired; }

// Whether this weapon should fire automatically when holding down the attack.
virtual bool IsAutomatic(void) const
inline virtual bool IsAutomatic(void) const
{
return ((GetNeoWepBits() & (NEO_WEP_AA13 | NEO_WEP_JITTE | NEO_WEP_JITTE_S |
NEO_WEP_KNIFE | NEO_WEP_MPN | NEO_WEP_MPN_S | NEO_WEP_MX | NEO_WEP_MX_S |
Expand All @@ -193,7 +193,7 @@ class CNEOBaseCombatWeapon : public CBaseHL2MPCombatWeapon
}

// Whether this weapon should fire only once per each attack command, even if held down.
bool IsSemiAuto(void) const { return !IsAutomatic(); }
inline bool IsSemiAuto(void) const { return !IsAutomatic(); }

virtual const Vector& GetBulletSpread(void) override;
virtual const WeaponSpreadInfo_t& GetSpreadInfo(void);
Expand Down
2 changes: 1 addition & 1 deletion src/game/shared/neo/weapons/weapon_tachi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class CWeaponTachi : public CNEOBaseCombatWeapon
virtual int GetMinBurst() OVERRIDE { return 1; }
virtual int GetMaxBurst() OVERRIDE { return 3; }

virtual bool IsAutomatic(void) const OVERRIDE
inline virtual bool IsAutomatic(void) const override final
{
return (m_bIsPrimaryFireMode == Tachi::Firemode::Auto);
}
Expand Down