kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@897 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-04-02 22:33:42 +00:00
parent e0c5539b29
commit c9d3e90683
9 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientextras.cpp
+23 -9
View File
@@ -64,11 +64,11 @@ void renderclients()
// creation of scoreboard pseudo-menu
void *scoremenu = NULL, *ctfmenu = NULL;
void *scoremenu = NULL, *teammenu = NULL, *ctfmenu = NULL;
void showscores(bool on)
{
menuset(on ? (m_ctf ? ctfmenu : scoremenu) : NULL);
menuset(on ? (m_ctf ? ctfmenu : (m_teammode ? teammenu : scoremenu)) : NULL);
}
struct sline { string s; };
@@ -80,9 +80,11 @@ void renderscore(void *menu, playerent *d, int cn)
if(d->ismaster) status = "\f0";
if(d->state==CS_DEAD) status = "\f4";
s_sprintfd(lag)("%d", d->plag);
if(m_ctf) s_sprintf(scorelines.add().s)("%d\t%d\t%s\t%d\t%s\t%s%s\t%d", d->flagscore, d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, d->team, status, d->name, cn);
else s_sprintf(scorelines.add().s)("%d\t%s\t%d\t%s\t%s%s\t%d", d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, m_teammode ? d->team : "", status, d->name, cn);
menumanual(menu, scorelines.length()-1, scorelines.last().s);
string &s = scorelines.add().s;
if(m_ctf) s_sprintf(s)("%d\t%d\t%s\t%d\t%s\t%s%s\t%d", d->flagscore, d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, d->team, status, d->name, cn);
else if(m_teammode) s_sprintf(s)("%d\t%s\t%d\t%s\t%s%s\t%d", d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, m_teammode ? d->team : "", status, d->name, cn);
else s_sprintf(s)("%d\t%s\t%d\t%s%s\t%d", d->frags, d->state==CS_LAGGED ? "LAG" : lag, d->ping, status, d->name, cn);
menumanual(menu, scorelines.length()-1, s);
}
struct teamscore
@@ -102,6 +104,15 @@ static int teamscorecmp(const teamscore *x, const teamscore *y)
return 0;
}
static int scorecmp(const playerent **x, const 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;
return 0;
}
vector<teamscore> teamscores;
void addteamscore(playerent *d)
@@ -118,12 +129,15 @@ void addteamscore(playerent *d)
void renderscores()
{
void *menu = m_ctf ? ctfmenu : scoremenu;
void *menu = m_ctf ? ctfmenu : (m_teammode ? teammenu : scoremenu);
scorelines.setsize(0);
if(!demoplayback) renderscore(menu, player1, getclientnum());
loopv(players) if(players[i]) renderscore(menu, players[i], i);
sortmenu(menu, 0, scorelines.length());
vector<playerent *> scores;
if(!demoplayback) scores.add(player1);
loopv(players) if(players[i]) scores.add(players[i]);
scores.sort(scorecmp);
loopv(scores) renderscore(menu, scores[i], scores[i]->clientnum);
if(m_teammode)
{
menumanual(menu, scorelines.length(), "");