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

Use CHN_WORLD for MAPSOUNDWORLD and CHN_GLOBAL for MAPSOUNDGLOBAL
Robyt3 · Oct 3, 2024 · 154b6d7 · 154b6d7
2 parents e61c79e + 03a06a1
commit 154b6d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/game/client/components/mapsounds.cpp b/src/game/client/components/mapsounds.cpp
@@ -17,20 +17,20 @@ CMapSounds::CMapSounds()
 	m_Count = 0;
 }
 
-void CMapSounds::Play(int SoundId)
+void CMapSounds::Play(int Channel, int SoundId)
 {
 	if(SoundId < 0 || SoundId >= m_Count)
 		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)
 		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()

diff --git a/src/game/client/components/mapsounds.h b/src/game/client/components/mapsounds.h
@@ -33,8 +33,8 @@ class CMapSounds : public CComponent
 	CMapSounds();
 	virtual int Sizeof() const override { return sizeof(*this); }
 
-	void Play(int SoundId);
-	void PlayAt(int SoundId, vec2 Position);
+	void Play(int Channel, int SoundId);
+	void PlayAt(int Channel, int SoundId, vec2 Position);
 
 	virtual void OnMapLoad() override;
 	virtual void OnRender() override;

diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
@@ -1105,7 +1105,7 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker, int Conn, bool Dumm
 			return;
 
 		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)
 				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));
 		}
 	}
 }