Skip to content

Commit

Permalink
don't send radio message to teammate (if freeforall 1) (#958)
Browse files Browse the repository at this point in the history
* don't send radio message to teammate (if freeforall 1)
* don't send message zero length
  • Loading branch information
Vaqtincha authored Apr 15, 2024
1 parent f24cccf commit d5eb9c3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions regamedll/dlls/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Radio)(const char *msg_id, const char *msg
continue;

// is this player on our team? (even dead players hear our radio calls)
if (pPlayer->m_iTeam == m_iTeam)
if (g_pGameRules->PlayerRelationship(this, pPlayer) == GR_TEAMMATE)
bSend = true;
}
// this means we're a spectator
Expand All @@ -396,7 +396,7 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Radio)(const char *msg_id, const char *msg
if (FNullEnt(pPlayer->m_hObserverTarget))
continue;

if (pPlayer->m_hObserverTarget && pPlayer->m_hObserverTarget->m_iTeam == m_iTeam)
if (pPlayer->m_hObserverTarget && g_pGameRules->PlayerRelationship(this, pPlayer->m_hObserverTarget) == GR_TEAMMATE)
{
bSend = true;
}
Expand All @@ -411,7 +411,7 @@ void EXT_FUNC CBasePlayer::__API_HOOK(Radio)(const char *msg_id, const char *msg
MESSAGE_END();

// radio message icon
if (msg_verbose)
if (msg_verbose && msg_verbose[0] != 0)
{
// search the place name where is located the player
const char *placeName = nullptr;
Expand Down

0 comments on commit d5eb9c3

Please sign in to comment.