Skip to content

Spatial reload sounds, stop reload sounds when dropping or switching weapon, fix for weapons reloading on the floor #610

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
AdamTadeusz merged 4 commits into from
Sep 30, 2024
Merged

Spatial reload sounds, stop reload sounds when dropping or switching weapon, fix for weapons reloading on the floor #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
babd3f3
reload sounds are spacial, are canceled on weapon drop and weapon swi…
AdamTadeusz Sep 18, 2024
224248f
brackets, indentation, getActiveWeapon once
AdamTadeusz Sep 19, 2024
62174b7
unnecessarily stoping weapon reload sound twice
AdamTadeusz Sep 20, 2024
d724396
remember to stop game before making commits. Also enc_temp_folder sho…
AdamTadeusz Sep 20, 2024
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: 15 additions & 3 deletions mp/src/game/server/neo/neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,6 +1868,11 @@ bool CNEO_Player::Weapon_Switch( CBaseCombatWeapon *pWeapon,
{
ShowCrosshair(false);
Weapon_SetZoom(false);
const auto activeWeapon = GetActiveWeapon();
if (activeWeapon)
{
activeWeapon->StopWeaponSound(RELOAD_NPC);
}

return BaseClass::Weapon_Switch(pWeapon, viewmodelindex);
}
Expand Down Expand Up @@ -1895,10 +1900,11 @@ bool CNEO_Player::Weapon_CanSwitchTo(CBaseCombatWeapon *pWeapon)
if (!pWeapon->CanDeploy())
return false;

if (GetActiveWeapon())
const auto activeWeapon = GetActiveWeapon();
if (activeWeapon)
{
if (!GetActiveWeapon()->CanHolster())
return false;
if (!activeWeapon->CanHolster())
return false;
}

return true;
Expand Down Expand Up @@ -2025,6 +2031,12 @@ void CNEO_Player::Weapon_Drop( CBaseCombatWeapon *pWeapon,
return; // Return early to not drop weapon
}
}

if (!pWeapon)
return;

pWeapon->m_bInReload = false;
pWeapon->StopWeaponSound(RELOAD_NPC);
BaseClass::Weapon_Drop(pWeapon, pvecTarget, pVelocity);
}

Expand Down
2 changes: 1 addition & 1 deletion mp/src/game/shared/basecombatweapon_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2064,7 +2064,7 @@ bool CBaseCombatWeapon::DefaultReload( int iClipSize1, int iClipSize2, int iActi
// On NEO, we want to always give out reload sound cues
#if defined(CLIENT_DLL) || defined(NEO)
// Play reload
WeaponSound( RELOAD );
CBaseCombatWeapon::WeaponSound(RELOAD_NPC);
#endif
SendWeaponAnim( iActivity );

Expand Down