Skip to content

Communicate player label in real time #695

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
AdamTadeusz merged 1 commit into from
Oct 13, 2024
Merged

Communicate player label in real time #695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 51 additions & 1 deletion mp/src/game/client/game_controls/SpectatorGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,12 @@ void CSpectatorGUI::OnThink()
V_sprintf_safe(scoreBuff, "%d", Max(0, Min(99, pNsfTeam->GetRoundsWon())));
m_scoreValueLabelNSF->SetText(scoreBuff);
}

// Update player health
if (m_pPlayerLabel->IsVisible())
{
UpdatePlayerLabel();
}
#endif
}
}
Expand Down Expand Up @@ -709,7 +715,9 @@ void CSpectatorGUI::Update()
m_pPlayerLabel->SetVisible( ShouldShowPlayerLabel(specmode) );

// update player name filed, text & color

#ifdef NEO
UpdatePlayerLabel();
#else
if ( playernum > 0 && playernum <= gpGlobals->maxClients && gr )
{
Color c = gr->GetTeamColor( gr->GetTeam(playernum) ); // Player's team color
Expand Down Expand Up @@ -738,6 +746,7 @@ void CSpectatorGUI::Update()
{
m_pPlayerLabel->SetText( L"" );
}
#endif

// update extra info field
wchar_t szEtxraInfo[1024];
Expand Down Expand Up @@ -783,6 +792,47 @@ void CSpectatorGUI::UpdateTimer()
SetLabelText("timerlabel", szText );
}

#ifdef NEO
//-----------------------------------------------------------------------------
// Purpose: Updates the spectated player's health
//-----------------------------------------------------------------------------
void CSpectatorGUI::UpdatePlayerLabel()
{
IGameResources* gr = GameResources();
int specmode = GetSpectatorMode();
int playernum = GetSpectatorTarget();

// update player name filed, text & color
if (playernum > 0 && playernum <= gpGlobals->maxClients && gr)
{
Color c = gr->GetTeamColor(gr->GetTeam(playernum)); // Player's team color

m_pPlayerLabel->SetFgColor(c);

wchar_t playerText[80], playerName[64], health[10];
Comment thread
Rainyan marked this conversation as resolved.
V_wcsncpy(playerText, L"Unable to find #Spec_PlayerItem*", sizeof(playerText));
memset(playerName, 0x0, sizeof(playerName));

g_pVGuiLocalize->ConvertANSIToUnicode(UTIL_SafeName(gr->GetPlayerName(playernum)), playerName, sizeof(playerName));
int iHealth = gr->GetHealth(playernum);
if (iHealth > 0 && gr->IsAlive(playernum))
{
_snwprintf(health, ARRAYSIZE(health), L"%i", iHealth);
g_pVGuiLocalize->ConstructString(playerText, sizeof(playerText), g_pVGuiLocalize->Find("#Spec_PlayerItem_Team"), 2, playerName, health);
}
else
{
g_pVGuiLocalize->ConstructString(playerText, sizeof(playerText), g_pVGuiLocalize->Find("#Spec_PlayerItem"), 1, playerName);
}

m_pPlayerLabel->SetText(playerText);
}
else
{
m_pPlayerLabel->SetText(L"");
}
}
#endif
static void ForwardSpecCmdToServer( const CCommand &args )
{
if ( engine->IsPlayingDemo() )
Expand Down
3 changes: 3 additions & 0 deletions mp/src/game/client/game_controls/spectatorgui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ class CSpectatorGUI : public vgui::EditablePanel, public IViewPortPanel
void SetLabelText(const char *textEntryName, wchar_t *text);
void MoveLabelToFront(const char *textEntryName);
void UpdateTimer();
#ifdef NEO
void UpdatePlayerLabel();
#endif
void SetLogoImage(const char *image);

protected:
Expand Down