Skip to content

Fix onClientWorldSound event cancellation for non-entity sounds (#3269) #4416

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
merged 2 commits into from
Sep 4, 2025
Merged

Fix onClientWorldSound event cancellation for non-entity sounds (#3269) #4416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05a6ea5
Refactor WorldSoundHandler
MohabCodeX Sep 4, 2025
480fef5
Merge branch 'master' into fix/cancel-world-sound
MohabCodeX Sep 4, 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
30 changes: 18 additions & 12 deletions Client/mods/deathmatch/logic/CClientGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6477,20 +6477,26 @@ bool CClientGame::WorldSoundHandler(const SWorldSoundEvent& event)
// Audio events without a game entity could default to the root element, but the
// best approach is to avoid spamming the event with the barely notable sounds (without a source).
// Warning: Canceling sounds emitted by an audio entity (like vehicles do) will cause massive spam
CClientEntity* pEntity = nullptr;

if (event.pGameEntity)
{
CPools* pPools = g_pGame->GetPools();
CClientEntity* pEntity = pPools->GetClientEntity((DWORD*)event.pGameEntity);
if (pEntity)
{
CLuaArguments Arguments;
Arguments.PushNumber(event.uiGroup);
Arguments.PushNumber(event.uiIndex);
Arguments.PushNumber(event.vecPosition.fX);
Arguments.PushNumber(event.vecPosition.fY);
Arguments.PushNumber(event.vecPosition.fZ);
return pEntity->CallEvent("onClientWorldSound", Arguments, true);
}
CPools* pPools = g_pGame->GetPools();
pEntity = pPools->GetClientEntity((DWORD*)event.pGameEntity);
}

if (!pEntity)
pEntity = GetRootEntity();

if (pEntity)
{
CLuaArguments Arguments;
Arguments.PushNumber(event.uiGroup);
Arguments.PushNumber(event.uiIndex);
Arguments.PushNumber(event.vecPosition.fX);
Arguments.PushNumber(event.vecPosition.fY);
Arguments.PushNumber(event.vecPosition.fZ);
return pEntity->CallEvent("onClientWorldSound", Arguments, true);
}

return true;
Expand Down