Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix voice message always being sent to enemies in team message

Browse source
This commit is contained in:
smallmodel 2024-11-17 20:26:40 +01:00
parent 953091cdc8
commit e74e113199
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
code/fgame/player.cpp
View file

@ -10764,7 +10764,7 @@ void Player::EventDMMessage(Event *ev)
if (iMode == 0) {
//
// team message
// everyone
//
if (!IsSpectator() || g_spectate_allow_full_chat->integer) {
for (i = 0; i < game.maxclients; i++) {
@ -10826,35 +10826,26 @@ void Player::EventDMMessage(Event *ev)
}
} else {
for (i = 0; i < game.maxclients; i++) {
bool bSameTeam;
ent = &g_entities[i];
if (!ent->inuse || !ent->entity) {
continue;
}
if (static_cast<Player *>(ent->entity)->GetTeam() != GetTeam()) {
gi.MSG_SetClient(i);
gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_VOICE_CHAT));
gi.MSG_WriteCoord(m_vViewPos[0]);
gi.MSG_WriteCoord(m_vViewPos[1]);
gi.MSG_WriteCoord(m_vViewPos[2]);
gi.MSG_WriteBits(qtrue, 1);
gi.MSG_WriteBits(edict - g_entities, 6);
gi.MSG_WriteString(sAliasName.c_str());
gi.MSG_EndCGM();
continue;
bSameTeam = static_cast<Player*>(ent->entity)->GetTeam() == GetTeam();
if (bSameTeam) {
gi.SendServerCommand(i, "%s", szPrintString);
}
gi.SendServerCommand(i, "%s", szPrintString);
if (bInstaMessage) {
gi.MSG_SetClient(i);
gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_VOICE_CHAT));
gi.MSG_WriteCoord(m_vViewPos[0]);
gi.MSG_WriteCoord(m_vViewPos[1]);
gi.MSG_WriteCoord(m_vViewPos[2]);
gi.MSG_WriteBits(qfalse, 1);
gi.MSG_WriteBits(!bSameTeam, 1);
gi.MSG_WriteBits(edict - g_entities, 6);
gi.MSG_WriteString(sAliasName.c_str());
gi.MSG_EndCGM();