From 6994b32f258bb1f44af8466e8c5257eac33f65fe Mon Sep 17 00:00:00 2001 From: s1lent Date: Fri, 15 Dec 2017 01:35:42 +0700 Subject: [PATCH] HLTV: Rename GROUP_UNKNOWN to GROUP_MULTICAST --- rehlds/HLTV/Proxy/src/Proxy.cpp | 4 ++-- rehlds/HLTV/Proxy/src/ProxyClient.cpp | 2 +- rehlds/HLTV/Proxy/src/Status.cpp | 2 +- rehlds/public/HLTV/IProxy.h | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rehlds/HLTV/Proxy/src/Proxy.cpp b/rehlds/HLTV/Proxy/src/Proxy.cpp index b1ccfc7..351e9e2 100644 --- a/rehlds/HLTV/Proxy/src/Proxy.cpp +++ b/rehlds/HLTV/Proxy/src/Proxy.cpp @@ -1063,7 +1063,7 @@ void Proxy::CMD_ClientCmd(char *cmdLine) switch (group) { case 1: // spectators - group = GROUP_CLIENT | GROUP_DEMO | GROUP_UNKNOWN; + group = GROUP_CLIENT | GROUP_DEMO | GROUP_MULTICAST; break; case 2: // proxies group = GROUP_PROXY; @@ -1462,7 +1462,7 @@ void Proxy::BroadcastRetryMessage() msg.WriteByte(svc_centerprint); msg.WriteString("Retrying HLTV connection ..."); - Broadcast(msg.GetData(), msg.CurrentSize(), GROUP_CLIENT | GROUP_PROXY | GROUP_UNKNOWN, false); + Broadcast(msg.GetData(), msg.CurrentSize(), GROUP_CLIENT | GROUP_PROXY | GROUP_MULTICAST, false); } void Proxy::StopBroadcast(const char *message) diff --git a/rehlds/HLTV/Proxy/src/ProxyClient.cpp b/rehlds/HLTV/Proxy/src/ProxyClient.cpp index c340e50..40bd5b3 100644 --- a/rehlds/HLTV/Proxy/src/ProxyClient.cpp +++ b/rehlds/HLTV/Proxy/src/ProxyClient.cpp @@ -294,7 +294,7 @@ void ProxyClient::ParseVoiceData(NetPacket *packet) voiceMsg.WriteShort(nDataLength); voiceMsg.WriteBuf(packet->data.CurrentByte(), nDataLength); - m_Proxy->Broadcast(voiceMsg.GetData(), voiceMsg.CurrentSize(), GROUP_PROXY | GROUP_DEMO | GROUP_UNKNOWN | GROUP_VOICE, false); + m_Proxy->Broadcast(voiceMsg.GetData(), voiceMsg.CurrentSize(), GROUP_PROXY | GROUP_DEMO | GROUP_MULTICAST | GROUP_VOICE, false); packet->data.SkipBytes(nDataLength); } diff --git a/rehlds/HLTV/Proxy/src/Status.cpp b/rehlds/HLTV/Proxy/src/Status.cpp index 46ad212..6d91a70 100644 --- a/rehlds/HLTV/Proxy/src/Status.cpp +++ b/rehlds/HLTV/Proxy/src/Status.cpp @@ -131,7 +131,7 @@ void Status::SendStatusUpdate() cmd.WriteToStream(&buffer); // group spectators - m_Proxy->Broadcast(buffer.GetData(), buffer.CurrentSize(), GROUP_CLIENT | GROUP_DEMO | GROUP_UNKNOWN, false); + m_Proxy->Broadcast(buffer.GetData(), buffer.CurrentSize(), GROUP_CLIENT | GROUP_DEMO | GROUP_MULTICAST, false); buffer.FastClear(); } diff --git a/rehlds/public/HLTV/IProxy.h b/rehlds/public/HLTV/IProxy.h index 6724897..68f0d75 100644 --- a/rehlds/public/HLTV/IProxy.h +++ b/rehlds/public/HLTV/IProxy.h @@ -39,16 +39,16 @@ class BitBuffer; class NetAddress; class IObjectContainer; -#define MAX_PROXY_CLIENTS 255 +#define MAX_PROXY_CLIENTS 255 -#define GROUP_CLIENT 0x00001 // Broadcast to client -#define GROUP_PROXY 0x00002 // Broadcast to proxy -#define GROUP_DEMO 0x00004 // Broadcast to demo file -#define GROUP_UNKNOWN 0x00008 // Broadcast to UNKNOWN: unused -#define GROUP_VOICE 0x00010 // Broadcast to voice enabled clients -#define GROUP_CHAT 0x00020 // Broadcast to chat enabled clients +#define GROUP_CLIENT 0x00001 // Broadcast to client +#define GROUP_PROXY 0x00002 // Broadcast to proxy +#define GROUP_DEMO 0x00004 // Broadcast to demo file +#define GROUP_MULTICAST 0x00008 // Broadcast to multicast (obsolete) +#define GROUP_VOICE 0x00010 // Broadcast to voice enabled clients +#define GROUP_CHAT 0x00020 // Broadcast to chat enabled clients -#define GROUP_CLIENT_ALL GROUP_CLIENT | GROUP_PROXY | GROUP_DEMO | GROUP_UNKNOWN +#define GROUP_CLIENT_ALL GROUP_CLIENT | GROUP_PROXY | GROUP_DEMO | GROUP_MULTICAST enum ChatMode_e : int {