Skip to content

[Audio] Fix ordering of hitsound calls in CBaseHLBludgeonWeapon::Swing() and play melee hitsound in CBaseHLBludgeonWeapon::Hit() #1499

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Audio] Fix ordering of hitsound calls in CBaseHLBludgeonWeapon::Swing() and play melee hitsound in CBaseHLBludgeonWeapon::Hit() #1499

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc4a2b2
Fix ordering of hitsound calls in CBaseHLBludgeonWeapon::Swing() and …
pivotman319-owo Aug 18, 2025
eb421f1
cleanup unreachable MELEE_HIT_WORLD weaponsound code
pivotman319-owo Aug 18, 2025
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
9 changes: 6 additions & 3 deletions src/game/server/basebludgeonweapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ void CBaseHLBludgeonWeapon::Hit( trace_t &traceHit, Activity nHitActivity, bool
{
gamestats->Event_WeaponHit( pPlayer, !bIsSecondary, GetClassname(), info );
}

// Play hit sound
WeaponSound( MELEE_HIT );
}

// Apply an impact effect
Expand Down Expand Up @@ -360,6 +363,9 @@ void CBaseHLBludgeonWeapon::Swing( int bIsSecondary )
if ( traceHit.fraction == 1.0f )
{
nHitActivity = bIsSecondary ? ACT_VM_MISSCENTER2 : ACT_VM_MISSCENTER;

// Play swing sound
WeaponSound( SINGLE );

// We want to test the first swing again
Vector testEnd = swingStart + forward * GetRange();
Expand All @@ -378,7 +384,4 @@ void CBaseHLBludgeonWeapon::Swing( int bIsSecondary )
//Setup our next attack times
m_flNextPrimaryAttack = gpGlobals->curtime + GetFireRate();
m_flNextSecondaryAttack = gpGlobals->curtime + SequenceDuration();

//Play swing sound
WeaponSound( SINGLE );
}