From 22c19f45dbb38b234e96279897ee96ec86832701 Mon Sep 17 00:00:00 2001 From: oy Date: Sat, 17 Jul 2010 19:55:17 +0200 Subject: fixed hook sound bug in demos. Closes #161 --- src/game/client/gameclient.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/game/client') diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp index d59a7a04..a3f618ab 100644 --- a/src/game/client/gameclient.cpp +++ b/src/game/client/gameclient.cpp @@ -545,9 +545,15 @@ void CGameClient::OnMessage(int MsgId, CUnpacker *pUnpacker) { if(m_SuppressEvents) return; - + + // don't enqueue pseudo-global sounds from demos (created by PlayAndRecord) CNetMsg_Sv_SoundGlobal *pMsg = (CNetMsg_Sv_SoundGlobal *)pRawMsg; - g_GameClient.m_pSounds->Enqueue(pMsg->m_Soundid); + if(pMsg->m_Soundid == SOUND_CTF_DROP || pMsg->m_Soundid == SOUND_CTF_RETURN || + pMsg->m_Soundid == SOUND_CTF_CAPTURE || pMsg->m_Soundid == SOUND_CTF_GRAB_EN || + pMsg->m_Soundid == SOUND_CTF_GRAB_PL) + g_GameClient.m_pSounds->Enqueue(pMsg->m_Soundid); + else + g_GameClient.m_pSounds->Play(CSounds::CHN_GLOBAL, pMsg->m_Soundid, 1.0f, vec2(0,0)); } } -- cgit 1.4.1