yvt/openspades
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show Dead players in gray on scoreboard

Browse Source 
This is done for all cases, but that is probably a bad idea. While this
does not matter in public games, in small tournaments this could be an
advantage. Ideally, the server could disable giving players this
information
This commit is contained in:
notafile 2017-09-07 20:32:24 +02:00
parent bfe62a0a2c
commit 79689848dd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/Client/ScoreboardView.cpp
View File

@ -49,7 +49,7 @@ namespace spades {
static const Vector4 spectatorTextColor = {220.f / 255, 220.f / 255, 0,
1}; // Goldish yellow
static const auto spectatorTeamId = 255; // Spectators have a team id of 255
ScoreboardView::ScoreboardView(Client *client)
: client(client), renderer(client->GetRenderer()) {
@ -61,7 +61,7 @@ namespace spades {
// Use GUI font if spectator string has special chars
auto spectatorString = _TrN("Client", "Spectator{1}", "Spectators{1}", "", "");
auto has_special_char =
auto has_special_char =
std::find_if(spectatorString.begin(), spectatorString.end(),
[](char ch) {
return !(isalnum(static_cast<unsigned char>(ch)) || ch == '_');
@ -231,6 +231,7 @@ namespace spades {
int id;
int score;
std::string name;
bool alive;
bool operator<(const ScoreboardEntry &ent) const { return score > ent.score; }
};
@ -241,6 +242,7 @@ namespace spades {
char buf[256];
Vector2 size;
Vector4 white = {1, 1, 1, 1};
Vector4 gray = {0.5, 0.5, 0.5, 1};
int maxRows = (int)floorf(height / rowHeight);
int numPlayers = 0;
int cols;
@ -256,6 +258,7 @@ namespace spades {
ScoreboardEntry ent;
ent.name = p->GetName();
ent.score = world->GetPlayerPersistent(i).kills;
ent.alive = p->IsAlive();
ent.id = i;
entries.push_back(ent);
@ -295,8 +298,12 @@ namespace spades {
font->Draw(buf, MakeVector2(colX + 35.f - size.x, rowY), 1.f, white);
}
color = ent.alive ? white : gray;
font->Draw(ent.name, MakeVector2(colX + 45.f, rowY), 1.f, color);
color = white;
sprintf(buf, "%d", ent.score);
size = font->Measure(buf);
font->Draw(buf, MakeVector2(colX + colWidth - 10.f - size.x, rowY), 1.f, color);