kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
957f1e49caf31eed694dd830c1215c50df845662
assaultcube-/source/src/scoreboard.cpp
T
aurhat f10342fa80 Improve game time and wall clock display 
1. Counting backward for gametimedisplay = 1 and forward for 2. The setting
added to HUD menu.
2. Changed name from clockdisplay to gimetimedisplay, in order to
distinguish clocks with system time and game time.
3. Added to wall clock options with UTC/GMT time and 12h format.

DOCREF clockcount clockdisplay gametimedisplay
2015-09-06 22:09:00 +02:00

558 lines
18 KiB
C++
Raw Blame History

// creation of scoreboard pseudo-menu
#include "cube.h"
#define SCORERATIO(F,D) (float)(F >= 0 ? F : 0) / (float)(D > 0 ? D : 1)
void *scoremenu = NULL;
bool needscoresreorder = true;
void showscores(bool on)
{
if(on) showmenu("score", false);
else closemenu("score");
}
COMMANDF(showscores, "i", (int *on) { showscores(*on != 0); });
VARFP(sc_flags, 0, 0, 100, needscoresreorder = true);
VARFP(sc_frags, 0, 1, 100, needscoresreorder = true);
VARFP(sc_deaths, -1, 2, 100, needscoresreorder = true);
VARFP(sc_ratio, -1, -1, 100, needscoresreorder = true);
VARFP(sc_score, -1, 4, 100, needscoresreorder = true);
VARFP(sc_lag, -1, 5, 100, needscoresreorder = true);
VARFP(sc_clientnum, 0, 6, 100, needscoresreorder = true);
VARFP(sc_name, 0, 7, 100, needscoresreorder = true);
struct coldata
{
int priority;
char *val;
coldata() : priority(-1), val(NULL) {}
~coldata()
{
DELETEA(val);
}
};
// FIXME ? if two columns share teh same priority
// they will be sorted by the order they were added with addcol
int sortcolumns(coldata *col_a, coldata *col_b)
{
if(col_a->priority > col_b->priority) return 1;
else if(col_a->priority < col_b->priority) return -1;
return 0;
}
struct sline
{
string s;
color *bgcolor;
char textcolor;
vector<coldata> cols;
sline() : bgcolor(NULL), textcolor(0) { copystring(s, ""); }
void addcol(int priority, const char *format = NULL, ...) PRINTFARGS(3, 4)
{
if(priority < 0) return;
coldata &col = cols.add();
col.priority = priority;
if(format && *format)
{
defvformatstring(sf, format, format);
col.val = newstring(sf);
}
}
char *getcols()
{
if(s[0] == '\0')
{
if(textcolor) formatstring(s)("\f%c", textcolor);
cols.sort(sortcolumns);
loopv(cols)
{
if(i > 0) concatstring(s, "\t");
if(cols[i].val) concatstring(s, cols[i].val);
}
}
return s;
}
};
static vector<sline> scorelines;
vector<discscore> discscores;
struct teamscore
{
int team, frags, deaths, flagscore, points;
vector<playerent *> teammembers;
teamscore(int t) : team(t), frags(0), deaths(0), flagscore(0), points(0) {}
void addplayer(playerent *d)
{
if(!d) return;
teammembers.add(d);
frags += d->frags;
deaths += d->deaths;
points += d->points;
if(m_flags) flagscore += d->flagscore;
}
void addscore(discscore &d)
{
frags += d.frags;
deaths += d.deaths;
points += d.points;
if(m_flags) flagscore += d.flags;
}
};
void teamflagscores(int &team1, int &team2)
{
teamscore teamscores[2] = { teamscore(TEAM_CLA), teamscore(TEAM_RVSF) };
loopv(players) if(players[i] && players[i]->team != TEAM_SPECT)
{
teamscores[team_base(players[i]->team)].addplayer(players[i]);
}
loopv(discscores) if(discscores[i].team != TEAM_SPECT)
{
teamscores[team_base(discscores[i].team)].addscore(discscores[i]);
}
if(!watchingdemo) teamscores[team_base(player1->team)].addplayer(player1);
team1 = teamscores[0].flagscore;
team2 = teamscores[1].flagscore;
}
static int teamscorecmp(const teamscore *x, const teamscore *y)
{
if(x->flagscore > y->flagscore) return -1;
if(x->flagscore < y->flagscore) return 1;
if(x->frags > y->frags) return -1;
if(x->frags < y->frags) return 1;
if(x->points > y->points) return -1;
if(x->points < y->points) return 1;
if(x->deaths < y->deaths) return -1;
return 0;
}
static int scorecmp(playerent **x, playerent **y)
{
if((*x)->flagscore > (*y)->flagscore) return -1;
if((*x)->flagscore < (*y)->flagscore) return 1;
if((*x)->frags > (*y)->frags) return -1;
if((*x)->frags < (*y)->frags) return 1;
if((*x)->points > (*y)->points) return -1;
if((*x)->points < (*y)->points) return 1;
if((*x)->deaths > (*y)->deaths) return 1;
if((*x)->deaths < (*y)->deaths) return -1;
if((*x)->lifesequence > (*y)->lifesequence) return 1;
if((*x)->lifesequence < (*y)->lifesequence) return -1;
return 0;
}
static int discscorecmp(const discscore *x, const discscore *y)
{
if(x->team < y->team) return -1;
if(x->team > y->team) return 1;
if(m_flags && x->flags > y->flags) return -1;
if(m_flags && x->flags < y->flags) return 1;
if(x->frags > y->frags) return -1;
if(x->frags < y->frags) return 1;
if(x->deaths > y->deaths) return 1;
if(x->deaths < y->deaths) return -1;
return strcmp(x->name, y->name);
}
// const char *scoreratio(int frags, int deaths, int precis = 0)
// {
// static string res;
// float ratio = SCORERATIO(frags, deaths);
// int precision = precis;
// if(!precision)
// {
// if(ratio<10.0f) precision = 2;
// else if(ratio<100.0f) precision = 1;
// }
// formatstring(res)("%.*f", precision, ratio);
// return res;
// }
void renderdiscscores(int team)
{
loopv(discscores) if(team == team_group(discscores[i].team))
{
discscore &d = discscores[i];
sline &line = scorelines.add();
if(team_isspect(d.team)) line.textcolor = '4';
const char *clag = team_isspect(d.team) ? "SPECT" : "";
if(m_flags) line.addcol(sc_flags, "%d", d.flags);
line.addcol(sc_frags, "%d", d.frags);
line.addcol(sc_deaths, "%d", d.deaths);
line.addcol(sc_ratio, "%.2f", SCORERATIO(d.frags, d.deaths));
if(multiplayer(false) || watchingdemo) line.addcol(sc_score, "%d", max(d.points, 0));
line.addcol(sc_lag, "%s", clag);
line.addcol(sc_clientnum, "DISC");
line.addcol(sc_name, "%s", d.name);
}
}
VARP(cncolumncolor, 0, 5, 9);
void renderscore(playerent *d)
{
const char *status = "";
string lagping;
static color localplayerc(0.2f, 0.2f, 0.2f, 0.2f);
if(d->clientrole==CR_ADMIN) status = d->state!=CS_ALIVE ? "\f7" : "\f3";
else if(d->state!=CS_ALIVE) status = "\f4";
if (team_isspect(d->team)) copystring(lagping, "SPECT");
else if (d->state==CS_LAGGED || (d->ping > 999 && d->plag > 99)) copystring(lagping, "LAG");
else
{
if(multiplayer(false)) formatstring(lagping)("%s/%s", colorpj(d->plag), colorping(d->ping));
else formatstring(lagping)("%d/%d", d->plag, d->ping);
}
const char *ign = d->ignored ? " (ignored)" : (d->muted ? " (muted)" : "");
sline &line = scorelines.add();
if(team_isspect(d->team)) line.textcolor = '4';
line.bgcolor = d==player1 ? &localplayerc : NULL;
if(m_flags) line.addcol(sc_flags, "%d", d->flagscore);
line.addcol(sc_frags, "%d", d->frags);
line.addcol(sc_deaths, "%d", d->deaths);
line.addcol(sc_ratio, "%.2f", SCORERATIO(d->frags, d->deaths));
if(multiplayer(false) || watchingdemo)
{
line.addcol(sc_score, "%d", max(d->points, 0));
line.addcol(sc_lag, "%s", lagping);
}
line.addcol(sc_clientnum, "\fs\f%d%d\fr", cncolumncolor, d->clientnum);
char flagicon = '\0';
if(m_flags) //show flag icon at flag carrier with use radaricons font
{
loopi(2)
{
if(flaginfos[i].state == CTFF_STOLEN && flaginfos[i].actor == d) flagicon = m_ktf ? 'L' : "DH"[i];
}
}
line.addcol(sc_name, "\fs%s%s\fr%s%s%c ", status, colorname(d), ign, flagicon ? " \a" : "", flagicon);
}
int totalplayers = 0;
void renderteamscore(teamscore *t)
{
if(!scorelines.empty()) // space between teams
{
sline &space = scorelines.add();
space.s[0] = 0;
}
sline &line = scorelines.add();
if(m_flags) line.addcol(sc_flags, "%d", t->flagscore);
line.addcol(sc_frags, "%d", t->frags);
line.addcol(sc_deaths, "%d", t->deaths);
line.addcol(sc_ratio, "%.2f", SCORERATIO(t->frags, t->deaths));
if(multiplayer(false) || watchingdemo)
{
line.addcol(sc_score, "%d", max(t->points, 0));
line.addcol(sc_lag);
}
line.addcol(sc_clientnum, "%s", team_string(t->team));
int n = t->teammembers.length();
line.addcol(sc_name, "(%d %s)", n, n == 1 ? "player" : "players");
static color teamcolors[2] = { color(1.0f, 0, 0, 0.2f), color(0, 0, 1.0f, 0.2f) };
line.bgcolor = &teamcolors[team_base(t->team)];
loopv(t->teammembers) renderscore(t->teammembers[i]);
}
extern bool watchingdemo;
void reorderscorecolumns()
{
static string scoreboardtitle;
needscoresreorder = false;
extern void *scoremenu;
sline sscore;
if(m_flags) sscore.addcol(sc_flags, "flags");
sscore.addcol(sc_frags, "frags");
sscore.addcol(sc_deaths, "deaths");
sscore.addcol(sc_ratio, "ratio");
if(multiplayer(false) || watchingdemo)
{
sscore.addcol(sc_score, "score");
sscore.addcol(sc_lag, "pj/ping");
}
sscore.addcol(sc_clientnum, "cn");
sscore.addcol(sc_name, "name");
copystring(scoreboardtitle, sscore.getcols());
menutitle(scoremenu, scoreboardtitle);
}
void renderscores(void *menu, bool init)
{
if(needscoresreorder) reorderscorecolumns();
static string modeline, serverline;
modeline[0] = '\0';
serverline[0] = '\0';
scorelines.shrink(0);
vector<playerent *> scores;
if(!watchingdemo) scores.add(player1);
totalplayers = 1;
loopv(players) if(players[i]) { scores.add(players[i]); totalplayers++; }
scores.sort(scorecmp);
discscores.sort(discscorecmp);
int spectators = 0;
loopv(scores) if(scores[i]->team == TEAM_SPECT) spectators++;
loopv(discscores) if(discscores[i].team == TEAM_SPECT) spectators++;
int winner = -1;
if(m_teammode)
{
teamscore teamscores[2] = { teamscore(TEAM_CLA), teamscore(TEAM_RVSF) };
loopv(scores) if(scores[i]->team != TEAM_SPECT) teamscores[team_base(scores[i]->team)].addplayer(scores[i]);
loopv(discscores) if(discscores[i].team != TEAM_SPECT) teamscores[team_base(discscores[i].team)].addscore(discscores[i]);
int sort = teamscorecmp(&teamscores[TEAM_CLA], &teamscores[TEAM_RVSF]) < 0 ? 0 : 1;
loopi(2)
{
renderteamscore(&teamscores[sort ^ i]);
renderdiscscores(sort ^ i);
}
winner = m_flags ?
(teamscores[sort].flagscore > teamscores[team_opposite(sort)].flagscore ? sort : -1) :
(teamscores[sort].frags > teamscores[team_opposite(sort)].frags ? sort : -1);
}
else
{ // ffa mode
loopv(scores) if(scores[i]->team != TEAM_SPECT) renderscore(scores[i]);
loopi(2) renderdiscscores(i);
if(scores.length() > 0)
{
winner = scores[0]->clientnum;
if(scores.length() > 1
&& ((m_flags && scores[0]->flagscore == scores[1]->flagscore)
|| (!m_flags && scores[0]->frags == scores[1]->frags)))
winner = -1;
}
}
if(spectators)
{
if(!scorelines.empty()) // space between teams and spectators
{
sline &space = scorelines.add();
space.s[0] = 0;
}
renderdiscscores(TEAM_SPECT);
loopv(scores) if(scores[i]->team == TEAM_SPECT) renderscore(scores[i]);
}
if(getclientmap()[0])
{
bool fldrprefix = !strncmp(getclientmap(), "maps/", strlen("maps/"));
formatstring(modeline)("\"%s\" on map %s", modestr(gamemode, modeacronyms > 0), fldrprefix ? getclientmap()+strlen("maps/") : getclientmap());
}
extern int minutesremaining, gametimedisplay;
extern string gtime;
if((gamemode>1 || (gamemode==0 && (multiplayer(false) || watchingdemo))) && minutesremaining >= 0)
{
if(!minutesremaining)
{
concatstring(modeline, ", intermission");
if (m_teammode) // Add in the winning team
{
switch(winner)
{
case TEAM_CLA: concatstring(modeline, ", \f3CLA wins!"); break;
case TEAM_RVSF: concatstring(modeline, ", \f1RVSF wins!"); break;
case -1:
default:
concatstring(modeline, ", \f2it's a tie!");
break;
}
}
else // Add the winning player
{
if (winner < 0) concatstring(modeline, ", \f2it's a tie!");
else concatformatstring(modeline, ", \f1%s wins!", scores[0]->name);
}
}
else
{
concatformatstring(modeline, ", %s", gtime);
if(gametimedisplay == 2) concatformatstring(modeline, " / %d:00", gametimemaximum/60000);
else concatformatstring(modeline, " remaining");
}
}
if(multiplayer(false))
{
serverinfo *s = getconnectedserverinfo();
if(s)
{
if(servstate.mastermode > MM_OPEN)
{
if(servstate.mastermode == MM_MATCH) concatformatstring(serverline, "M%d ", servstate.matchteamsize);
else concatstring(serverline, "P ");
}
// ft: 2010jun12: this can write over the menu boundary
//concatformatstring(serverline, "%s:%d %s", s->name, s->port, s->sdesc);
// for now we'll just cut it off, same as the serverbrowser
// but we might want to consider wrapping the bottom-line to accomodate longer descriptions - to a limit.
string text;
filtertext(text, s->sdesc, FTXT__SERVDESC);
//for(char *p = text; (p = strchr(p, '\"')); *p++ = ' ');
//text[30] = '\0'; // serverbrowser has less room - +8 chars here - 2010AUG03 - seems it was too much, falling back to 30 (for now): TODO get real width of menu as reference-width. FIXME: cutoff
concatformatstring(serverline, "%s:%d %s", s->name, s->port, text);
//printf("SERVERLINE: %s\n", serverline);
}
}
menureset(menu);
loopv(scorelines) menuimagemanual(menu, NULL, "radaricons", scorelines[i].getcols(), NULL, scorelines[i].bgcolor);
menuheader(menu, modeline, serverline);
// update server stats
static int lastrefresh = 0;
if(!lastrefresh || lastrefresh+5000<lastmillis)
{
refreshservers(NULL, init);
lastrefresh = lastmillis;
}
}
#define MAXJPGCOM 65533 // maximum JPEG comment length
void addstr(char *dest, const char *src) { if(strlen(dest) + strlen(src) < MAXJPGCOM) strcat(dest, src); }
const char *asciiscores(bool destjpg)
{
static char *buf = NULL;
static string team, flags, text;
playerent *d;
vector<playerent *> scores;
if(!buf) buf = (char *) malloc(MAXJPGCOM +1);
if(!buf) return "";
if(!watchingdemo) scores.add(player1);
loopv(players) if(players[i]) scores.add(players[i]);
scores.sort(scorecmp);
buf[0] = '\0';
if(destjpg)
{
formatstring(text)("AssaultCube Screenshot (%s)\n", asctime());
addstr(buf, text);
}
if(getclientmap()[0])
{
formatstring(text)("\n\"%s\" on map %s", modestr(gamemode, 0), getclientmap());
addstr(buf, text);
}
if(multiplayer(false))
{
serverinfo *s = getconnectedserverinfo();
if(s)
{
string sdesc;
filtertext(sdesc, s->sdesc, FTXT__SERVDESC | FTXT_NOCOLOR);
formatstring(text)(", %s:%d %s", s->name, s->port, sdesc);
addstr(buf, text);
}
}
if(destjpg)
addstr(buf, "\n");
else
{
formatstring(text)("\n%sfrags deaths cn%s name\n", m_flags ? "flags " : "", m_teammode ? " team" : "");
addstr(buf, text);
}
loopv(scores)
{
d = scores[i];
// const char *sr = scoreratio(d->frags, d->deaths);
formatstring(team)(destjpg ? ", %s" : " %-4s", team_string(d->team, true));
formatstring(flags)(destjpg ? "%d/" : " %4d ", d->flagscore);
if(destjpg)
formatstring(text)("%s%s (%s%d/%d)\n", d->name, m_teammode ? team : "", m_flags ? flags : "", d->frags, d->deaths);
else
formatstring(text)("%s %4d %4d %2d%s %s%s\n", m_flags ? flags : "", d->frags, d->deaths, d->clientnum,
m_teammode ? team : "", d->name, d->clientrole==CR_ADMIN ? " (admin)" : d==player1 ? " (you)" : "");
addstr(buf, text);
}
discscores.sort(discscorecmp);
loopv(discscores)
{
discscore &d = discscores[i];
// const char *sr = scoreratio(d.frags, d.deaths);
formatstring(team)(destjpg ? ", %s" : " %-4s", team_string(d.team, true));
formatstring(flags)(destjpg ? "%d/" : " %4d ", d.flags);
if(destjpg)
formatstring(text)("%s(disconnected)%s (%s%d/%d)\n", d.name, m_teammode ? team : "", m_flags ? flags : "", d.frags, d.deaths);
else
formatstring(text)("%s %4d %4d --%s %s(disconnected)\n", m_flags ? flags : "", d.frags, d.deaths, m_teammode ? team : "", d.name);
addstr(buf, text);
}
if(destjpg)
{
extern int minutesremaining;
formatstring(text)("(%sfrags/deaths), %d minute%s remaining\n", m_flags ? "flags/" : "", minutesremaining, minutesremaining == 1 ? "" : "s");
addstr(buf, text);
}
return buf;
}
void consolescores()
{
printf("%s\n", asciiscores());
}
void winners()
{
string winners = "";
vector<playerent *> scores;
if(!watchingdemo) scores.add(player1);
loopv(players) if(players[i]) { scores.add(players[i]); }
scores.sort(scorecmp);
discscores.sort(discscorecmp);
if(m_teammode)
{
teamscore teamscores[2] = { teamscore(TEAM_CLA), teamscore(TEAM_RVSF) };
loopv(scores) if(scores[i]->team != TEAM_SPECT) teamscores[team_base(scores[i]->team)].addplayer(scores[i]);
loopv(discscores) if(discscores[i].team != TEAM_SPECT)
teamscores[team_base(discscores[i].team)].addscore(discscores[i]);
int sort = teamscorecmp(&teamscores[TEAM_CLA], &teamscores[TEAM_RVSF]);
if(!sort) copystring(winners, "0 1");
else itoa(winners, sort < 0 ? 0 : 1);
}
else
{
loopv(scores)
{
if(!i || !scorecmp(&scores[i], &scores[i-1])) concatformatstring(winners, "%s%d", i ? " " : "", scores[i]->clientnum);
else break;
}
}
result(winners);
}
COMMAND(winners, "");
Reference in New Issue View Git Blame Copy Permalink