Skip to content

If a bot somehow gets a ping value, still display it as a bot #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 19, 2016
Merged

If a bot somehow gets a ping value, still display it as a bot #71

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
870a80c
Flip if
TomyLobo Jun 11, 2016
8fc6b68
Shortcut if
TomyLobo Jun 11, 2016
204a4b8
If a bot somehow gets a ping value, still display it as a bot
TomyLobo Jun 11, 2016
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
124 changes: 60 additions & 64 deletions mp/src/game/client/sdk/hud/sdk_scoreboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,84 +342,80 @@ void CSDKScoreboard::UpdatePlayerInfo()
for ( i = 1; i <= gpGlobals->maxClients; i++ )
{
bool shouldShow = sdkPR->IsConnected( i );
if ( shouldShow )
if (!shouldShow)
{
// add the player to the list
KeyValues *kv = new KeyValues("data");
kv->SetInt("playerIndex", i);
kv->SetInt("team", sdkPR->GetTeam( i ) );
kv->SetString("name", sdkPR->GetPlayerName(i) );
kv->SetInt("frags", sdkPR->GetStyle( i ));

#if defined ( SDK_USE_PLAYERCLASSES )
//Tony; for player classname, just look up directly from the player.
pOther = UTIL_PlayerByIndex(i);
if (pOther )
// remove the player
int itemID = FindItemIDForPlayerIndex( i );
if (itemID != -1)
{
int ot = pOther->GetTeamNumber();
if ( ot == localteam || localteam == TEAM_UNASSIGNED)
kv->SetString("class", SDKGameRules()->GetPlayerClassName( SDKGameResources()->GetPlayerClass(i), ot ) );
else
kv->SetString("class", "");
m_pPlayerList->RemoveItem(itemID);
}
else
kv->SetString("class","");
#endif

UpdatePlayerAvatar( i, kv );
continue;
}
// add the player to the list
KeyValues *kv = new KeyValues("data");
kv->SetInt("playerIndex", i);
kv->SetInt("team", sdkPR->GetTeam( i ) );
kv->SetString("name", sdkPR->GetPlayerName(i) );
kv->SetInt("frags", sdkPR->GetStyle( i ));

if (sdkPR->GetPing( i ) < 1)
{
if ( sdkPR->IsFakePlayer( i ) )
{
kv->SetString("ping", "BOT");
}
else
{
kv->SetString("ping", "");
}
}
#if defined ( SDK_USE_PLAYERCLASSES )
//Tony; for player classname, just look up directly from the player.
pOther = UTIL_PlayerByIndex(i);
if (pOther )
{
int ot = pOther->GetTeamNumber();
if ( ot == localteam || localteam == TEAM_UNASSIGNED)
kv->SetString("class", SDKGameRules()->GetPlayerClassName( SDKGameResources()->GetPlayerClass(i), ot ) );
else
{
kv->SetInt("ping", sdkPR->GetPing( i ));
}

int itemID = FindItemIDForPlayerIndex( i );
int sectionID = GetSectionFromTeamNumber( sdkPR->GetTeam( i ) );

if (itemID == -1)
{
// add a new row
itemID = m_pPlayerList->AddItem( sectionID, kv );
kv->SetString("class", "");
}
else
kv->SetString("class","");
#endif

HFont hItemFont = scheme()->GetIScheme( GetScheme() )->GetFont( "ScoreboardSmall", false );
m_pPlayerList->SetItemFont(itemID, hItemFont);
}
else
{
// modify the current row
m_pPlayerList->ModifyItem( itemID, sectionID, kv );
}
UpdatePlayerAvatar( i, kv );

if ( i == pPlayer->entindex() )
{
selectedRow = itemID; // this is the local player, hilight this row
}
if ( sdkPR->IsFakePlayer( i ) )
{
kv->SetString("ping", "BOT");
}
else if (sdkPR->GetPing( i ) < 1)
{
kv->SetString("ping", "");
}
else
{
kv->SetInt("ping", sdkPR->GetPing( i ));
}

// set the row color based on the players team
m_pPlayerList->SetItemFgColor( itemID, sdkPR->GetTeamColor( sdkPR->GetTeam( i ) ) );
int itemID = FindItemIDForPlayerIndex( i );
int sectionID = GetSectionFromTeamNumber( sdkPR->GetTeam( i ) );

if (itemID == -1)
{
// add a new row
itemID = m_pPlayerList->AddItem( sectionID, kv );

kv->deleteThis();
HFont hItemFont = scheme()->GetIScheme( GetScheme() )->GetFont( "ScoreboardSmall", false );
m_pPlayerList->SetItemFont(itemID, hItemFont);
}
else
{
// remove the player
int itemID = FindItemIDForPlayerIndex( i );
if (itemID != -1)
{
m_pPlayerList->RemoveItem(itemID);
}
// modify the current row
m_pPlayerList->ModifyItem( itemID, sectionID, kv );
}

if ( i == pPlayer->entindex() )
{
selectedRow = itemID; // this is the local player, hilight this row
}

// set the row color based on the players team
m_pPlayerList->SetItemFgColor( itemID, sdkPR->GetTeamColor( sdkPR->GetTeam( i ) ) );

kv->deleteThis();
}

if ( selectedRow != -1 )
Expand Down