edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-10-19 07:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9099 from infclass/ddnet-sound-channels

Browse source 
Use CHN_WORLD for MAPSOUNDWORLD and CHN_GLOBAL for MAPSOUNDGLOBAL
This commit is contained in:
heinrich5991 2024-10-03 09:22:52 +00:00 committed by GitHub
parent e61c79ea4c 03a06a144d
commit 154b6d79f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/client/components/mapsounds.cpp
View file

@ -17,20 +17,20 @@ CMapSounds::CMapSounds()
m_Count = 0; m_Count = 0;
} }
void CMapSounds::Play(int SoundId) void CMapSounds::Play(int Channel, int SoundId)
{ {
if(SoundId < 0 || SoundId >= m_Count) if(SoundId < 0 || SoundId >= m_Count)
return; return;
m_pClient->m_Sounds.PlaySample(CSounds::CHN_MAPSOUND, m_aSounds[SoundId], 0, 1.0f); m_pClient->m_Sounds.PlaySample(Channel, m_aSounds[SoundId], 0, 1.0f);
} }
void CMapSounds::PlayAt(int SoundId, vec2 Position) void CMapSounds::PlayAt(int Channel, int SoundId, vec2 Position)
{ {
if(SoundId < 0 || SoundId >= m_Count) if(SoundId < 0 || SoundId >= m_Count)
return; return;
m_pClient->m_Sounds.PlaySampleAt(CSounds::CHN_MAPSOUND, m_aSounds[SoundId], 0, 1.0f, Position); m_pClient->m_Sounds.PlaySampleAt(Channel, m_aSounds[SoundId], 0, 1.0f, Position);
} }
void CMapSounds::OnMapLoad() void CMapSounds::OnMapLoad()

4
src/game/client/components/mapsounds.h
View file

@ -33,8 +33,8 @@ public:
CMapSounds(); CMapSounds();
virtual int Sizeof() const override { return sizeof(*this); } virtual int Sizeof() const override { return sizeof(*this); }
void Play(int SoundId); void Play(int Channel, int SoundId);
void PlayAt(int SoundId, vec2 Position); void PlayAt(int Channel, int SoundId, vec2 Position);
virtual void OnMapLoad() override; virtual void OnMapLoad() override;
virtual void OnRender() override; virtual void OnRender() override;

4
src/game/client/gameclient.cpp
View file

@ -1105,7 +1105,7 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
return; return;
CNetMsg_Sv_MapSoundGlobal *pMsg = (CNetMsg_Sv_MapSoundGlobal *)pRawMsg; CNetMsg_Sv_MapSoundGlobal *pMsg = (CNetMsg_Sv_MapSoundGlobal *)pRawMsg;
m_MapSounds.Play(pMsg->m_SoundId); m_MapSounds.Play(CSounds::CHN_GLOBAL, pMsg->m_SoundId);
} }
} }
@ -1286,7 +1286,7 @@ void CGameClient::ProcessEvents()
if(!Config()->m_SndGame) if(!Config()->m_SndGame)
continue; continue;
m_MapSounds.PlayAt(pEvent->m_SoundId, vec2(pEvent->m_X, pEvent->m_Y)); m_MapSounds.PlayAt(CSounds::CHN_WORLD, pEvent->m_SoundId, vec2(pEvent->m_X, pEvent->m_Y));
} }
} }
} }