edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

show who is following you in spectator mode. Closes #594

Browse source
This commit is contained in:
oy 2012-02-15 01:40:47 +01:00
parent bbfb6e5992
commit ab13e4a183
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datasrc/network.py
View file

@ -1,7 +1,7 @@
from datatypes import *
Emotes = ["NORMAL", "PAIN", "HAPPY", "SURPRISE", "ANGRY", "BLINK"]
PlayerFlags = ["CHATTING", "SCOREBOARD", "READY", "DEAD"]
PlayerFlags = ["CHATTING", "SCOREBOARD", "READY", "DEAD", "WATCHING"]
GameFlags = ["TEAMS", "FLAGS", "SURVIVAL"]
GameStateFlags = ["WARMUP", "SUDDENDEATH", "ROUNDOVER", "GAMEOVER", "PAUSED", "STARTCOUNTDOWN"]

22
src/game/client/components/scoreboard.cpp
View file

@ -98,9 +98,11 @@ void CScoreboard::RenderSpectators(float x, float y, float w)
// spectator names
y += 30.0f;
char aBuffer[1024*4];
aBuffer[0] = 0;
bool Multiple = false;
CTextCursor Cursor;
TextRender()->SetCursor(&Cursor, x+10.0f, y, 22.0f, TEXTFLAG_RENDER);
Cursor.m_LineWidth = w-20.0f;
Cursor.m_MaxLines = 4;
for(int i = 0; i < MAX_CLIENTS; ++i)
{
const CNetObj_PlayerInfo *pInfo = m_pClient->m_Snap.m_paPlayerInfos[i];
@ -108,15 +110,13 @@ void CScoreboard::RenderSpectators(float x, float y, float w)
continue;
if(Multiple)
str_append(aBuffer, ", ", sizeof(aBuffer));
str_append(aBuffer, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, sizeof(aBuffer));
TextRender()->TextEx(&Cursor, ", ", -1);
if(pInfo->m_PlayerFlags&PLAYERFLAG_WATCHING)
TextRender()->TextColor(1.0f, 1.0f, 0.0f, 1.0f);
TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);
TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
Multiple = true;
}
CTextCursor Cursor;
TextRender()->SetCursor(&Cursor, x+10.0f, y, 22.0f, TEXTFLAG_RENDER);
Cursor.m_LineWidth = w-20.0f;
Cursor.m_MaxLines = 4;
TextRender()->TextEx(&Cursor, aBuffer, -1);
}
void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const char *pTitle)
@ -282,7 +282,9 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
// name
// todo: improve visual player ready state
if(!(pInfo->m_PlayerFlags&PLAYERFLAG_READY))
TextRender()->TextColor(1.0f, 0.5f, 0.5f,ColorAlpha);
TextRender()->TextColor(1.0f, 0.5f, 0.5f, ColorAlpha);
else if(RenderDead && pInfo->m_PlayerFlags&PLAYERFLAG_WATCHING)
TextRender()->TextColor(1.0f, 1.0f, 0.0f, ColorAlpha);
TextRender()->SetCursor(&Cursor, NameOffset, y+Spacing, FontSize, TEXTFLAG_RENDER|TEXTFLAG_STOP_AT_END);
Cursor.m_LineWidth = NameLength;
TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aName, -1);

2
src/game/server/player.cpp
View file

@ -139,6 +139,8 @@ void CPlayer::Snap(int SnappingClient)
pPlayerInfo->m_PlayerFlags |= PLAYERFLAG_READY;
if(m_RespawnDisabled && (!GetCharacter() || !GetCharacter()->IsAlive()))
pPlayerInfo->m_PlayerFlags |= PLAYERFLAG_DEAD;
if(SnappingClient != -1 && (m_Team == TEAM_SPECTATORS || m_DeadSpecMode) && SnappingClient == m_SpectatorID)
pPlayerInfo->m_PlayerFlags |= PLAYERFLAG_WATCHING;
pPlayerInfo->m_Latency = SnappingClient == -1 ? m_Latency.m_Min : GameServer()->m_apPlayers[SnappingClient]->m_aActLatency[m_ClientID];
pPlayerInfo->m_Local = 0;
pPlayerInfo->m_ClientID = m_ClientID;