Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Voice] Pregame voice chat

Browse Source
This commit is contained in:
Diavolo 2022-08-13 19:10:37 +02:00
parent cb3f1f1506
commit 0a30c75159
No known key found for this signature in database
GPG Key ID: FA77F074E98D98A5
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Components/Modules/Voice.cpp
View File

@ -131,7 +131,7 @@ namespace Components
assert(cl->gentity); assert(cl->gentity);
for (int packet = 0; packet < packetCount; ++packet) for (auto packet = 0; packet < packetCount; ++packet)
{ {
voicePacket.dataSize = Game::MSG_ReadByte(msg); voicePacket.dataSize = Game::MSG_ReadByte(msg);
if (voicePacket.dataSize <= 0 || voicePacket.dataSize > MAX_VOICE_PACKET_DATA) if (voicePacket.dataSize <= 0 || voicePacket.dataSize > MAX_VOICE_PACKET_DATA)
@ -149,6 +149,44 @@ namespace Components
} }
} }
void Voice::SV_PreGameUserVoice(Game::client_t* cl, Game::msg_t* msg)
{
Game::VoicePacket_t voicePacket{};
if (!SV_VoiceEnabled())
{
return;
}
const auto talker = cl - Game::svs_clients;
AssertIn(talker, (*Game::sv_maxclients)->current.integer);
const auto packetCount = Game::MSG_ReadByte(msg);
for (auto packet = 0; packet < packetCount; ++packet)
{
voicePacket.dataSize = Game::MSG_ReadShort(msg);
if (voicePacket.dataSize <= 0 || voicePacket.dataSize > MAX_VOICE_PACKET_DATA)
{
Logger::Print(Game::CON_CHANNEL_SERVER, "Received invalid voice packet of size {} from {}\n", voicePacket.dataSize, cl->name);
return;
}
assert(voicePacket.dataSize <= MAX_VOICE_PACKET_DATA);
assert(msg->data);
assert(voicePacket.data);
Game::MSG_ReadData(msg, voicePacket.data, voicePacket.dataSize);
for (auto otherPlayer = 0; otherPlayer < (*Game::sv_maxclients)->current.integer; ++otherPlayer)
{
if (otherPlayer != talker && Game::svs_clients[otherPlayer].state >= Game::CS_CONNECTED)
{
SV_QueueVoicePacket(talker, otherPlayer, &voicePacket);
}
}
}
}
void Voice::SV_VoicePacket(Game::netadr_t from, Game::msg_t* msg) void Voice::SV_VoicePacket(Game::netadr_t from, Game::msg_t* msg)
{ {
auto qport = Game::MSG_ReadShort(msg); auto qport = Game::MSG_ReadShort(msg);
@ -158,7 +196,12 @@ namespace Components
return; return;
} }
if (cl->state == Game::CS_ACTIVE) cl->lastPacketTime = *Game::svs_time;
if (cl->state < Game::CS_ACTIVE)
{
SV_PreGameUserVoice(cl, msg);
}
else
{ {
assert(cl->gentity); assert(cl->gentity);
SV_UserVoice(cl, msg); SV_UserVoice(cl, msg);

3
src/Components/Modules/Voice.hpp
View File

@ -28,10 +28,11 @@ namespace Components
static void SV_QueueVoicePacket(int talkerNum, int clientNum, Game::VoicePacket_t* voicePacket); static void SV_QueueVoicePacket(int talkerNum, int clientNum, Game::VoicePacket_t* voicePacket);
static void G_BroadcastVoice(Game::gentity_s* talker, Game::VoicePacket_t* voicePacket); static void G_BroadcastVoice(Game::gentity_s* talker, Game::VoicePacket_t* voicePacket);
static void SV_UserVoice(Game::client_t* cl, Game::msg_t* msg); static void SV_UserVoice(Game::client_t* cl, Game::msg_t* msg);
static void SV_PreGameUserVoice(Game::client_t* cl, Game::msg_t* msg);
static void SV_VoicePacket(Game::netadr_t from, Game::msg_t* msg); static void SV_VoicePacket(Game::netadr_t from, Game::msg_t* msg);
static bool CL_IsPlayerMuted_Hk(Game::SessionData* session, int localClientNum, int muteClientIndex); static bool CL_IsPlayerMuted_Hk(Game::SessionData* session, int localClientNum, int muteClientIndex);
static void CL_MutePlayer_Hk(Game::SessionData* session, const int muteClientIndex); static void CL_MutePlayer_Hk(Game::SessionData* session, int muteClientIndex);
static void Voice_UnmuteMember_Hk(Game::SessionData* session, int clientNum); static void Voice_UnmuteMember_Hk(Game::SessionData* session, int clientNum);
static void CL_TogglePlayerMute(int localClientNum, int muteClientIndex); static void CL_TogglePlayerMute(int localClientNum, int muteClientIndex);