From d5eb9c34d2acc2f771110044721b76538b05db3c Mon Sep 17 00:00:00 2001
From: Vaqtincha <51029683+Vaqtincha@users.noreply.github.com>
Date: Mon, 15 Apr 2024 13:49:44 +0500
Subject: [PATCH] don't send radio message to teammate (if freeforall 1) (#958)

* don't send radio message to teammate (if freeforall 1)
* don't send message zero length
---
 regamedll/dlls/player.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
index 63ea1d060..0e400bc51 100644
--- a/regamedll/dlls/player.cpp
+++ b/regamedll/dlls/player.cpp
@@ -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
@@ -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;
 			}
@@ -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;