Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/game/client/neo/ui/neo_hud_player_ping.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,16 @@ void CNEOHud_PlayerPing::FireGameEvent(IGameEvent* event)
return;
}

const int localTeam = GetLocalPlayerTeam();
const int playerTeam = event->GetInt("playerteam");
if (localTeam != TEAM_SPECTATOR && playerTeam != localTeam)
const int userID = event->GetInt("userid");
const int playerIndex = engine->GetPlayerForUserID(userID);
if (GetClientVoiceMgr()->IsPlayerBlocked(playerIndex) || (!NEORules()->IsTeamplay() && playerIndex != GetLocalPlayerIndex()))
{
return;
}

const int userID = event->GetInt("userid");
const int playerIndex = engine->GetPlayerForUserID(userID);
if (GetClientVoiceMgr()->IsPlayerBlocked(playerIndex))
const int localTeam = GetLocalPlayerTeam();
const int playerTeam = event->GetInt("playerteam");
if (localTeam != TEAM_SPECTATOR && playerTeam != localTeam)
{
return;
}
Expand Down Expand Up @@ -167,7 +167,7 @@ enum NeoPlayerPingsInSpectate
ConVar cl_neo_player_pings_in_spectate("cl_neo_player_pings_in_spectate", "1", FCVAR_ARCHIVE, "See pings of players playing the game. 0 = disabled, 1 = spectate target team, 2 = all", true, NEO_SPECTATE_PINGS_DISABLED, true, NEO_SPECTATE_PINGS_LAST_VALUE);
void CNEOHud_PlayerPing::DrawNeoHudElement()
{
if (!ShouldDraw() || !NEORules()->IsTeamplay())
if (!ShouldDraw())
{
return;
}
Expand Down
5 changes: 4 additions & 1 deletion src/game/server/neo/bot/behavior/neo_bot_behavior.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,10 @@ void CNEOBotMainAction::FireWeaponAtEnemy( CNEOBot *me )

if (bOnTarget)
{
me->PressSpecialFireButton(); // place a player ping to alert friends
if (NEORules()->IsTeamplay())
{
me->PressSpecialFireButton(); // place a player ping to alert friends
}

if (bThreatIsGhoster)
{
Expand Down