Merge pull request #8979 from ChillerDragon/pr_flag_sounds7

Fix 0.7 client flag sounds being duplicated when dummy is connected
This commit is contained in:
Dennis Felsing 2024-09-18 06:39:16 +00:00 committed by GitHub
commit b03245f7dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -620,9 +620,11 @@ void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
switch(GameMsgId)
{
case protocol7::GAMEMSG_CTF_DROP:
if(Conn == g_Config.m_ClDummy)
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_DROP);
break;
case protocol7::GAMEMSG_CTF_RETURN:
if(Conn == g_Config.m_ClDummy)
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_RETURN);
break;
case protocol7::GAMEMSG_TEAM_ALL:
@ -650,6 +652,7 @@ void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
}
break;
case protocol7::GAMEMSG_CTF_GRAB:
if(Conn == g_Config.m_ClDummy)
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_GRAB_EN);
break;
case protocol7::GAMEMSG_GAME_PAUSED:
@ -660,6 +663,7 @@ void *CGameClient::TranslateGameMsg(int *pMsgId, CUnpacker *pUnpacker, int Conn)
}
break;
case protocol7::GAMEMSG_CTF_CAPTURE:
if(Conn == g_Config.m_ClDummy)
m_Sounds.Enqueue(CSounds::CHN_GLOBAL, SOUND_CTF_CAPTURE);
int ClientId = clamp(aParaI[1], 0, MAX_CLIENTS - 1);
m_aStats[ClientId].m_FlagCaptures++;