Skip to content

Commit f28ad35

Browse files
committed
update(menus): Switch to SoundEvent
1 parent 983280f commit f28ad35

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

src/server/menus/MenuRenderer.cpp

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,22 @@
99
#include <utils/utils.h>
1010
#include <sdk/components/EmitSound_t.h>
1111
#include <sdk/components/CSingleRecipientFilter.h>
12+
#include <network/soundevents/soundevent.h>
1213

1314
typedef IGameEventListener2* (*GetLegacyGameEventListener)(CPlayerSlot slot);
1415

15-
typedef SndOpEventGuid_t(*CBaseEntity_EmitSoundFilter)(IRecipientFilter& filter, CEntityIndex ent, const EmitSound_t& params);
16-
1716
void EmitSoundFilter(int playerid, std::string sound_name, float pitch, float volume)
1817
{
1918
auto player = g_playerManager.GetPlayer(playerid);
2019
if (!player) return;
2120

22-
CEntityInstance* instance = (CEntityInstance*)player->GetController();
23-
if (!instance) return;
24-
25-
EmitSound_t params;
26-
params.m_pSoundName = sound_name.c_str();
27-
params.m_flVolume = volume;
28-
params.m_nPitch = pitch;
29-
30-
CBaseEntity_EmitSoundFilter filter = g_GameData.FetchSignature<CBaseEntity_EmitSoundFilter>("CBaseEntity_EmitSoundFilter");
21+
Soundevent sound;
22+
sound.SetName(sound_name);
23+
sound.SetFloat("public.volume", volume);
24+
sound.SetFloat("public.pitch", pitch);
3125

32-
CSingleRecipientFilter playerfilter(playerid);
33-
filter(playerfilter, instance->m_pEntity->m_EHandle.GetEntryIndex(), params);
26+
sound.AddClient(playerid);
27+
sound.Emit();
3428
}
3529

3630
MenuRenderer::MenuRenderer(Player* player)

0 commit comments

Comments
 (0)