From e985381a5f214d36a6924893997488fa15d157bd Mon Sep 17 00:00:00 2001 From: flowtron Date: Sat, 12 Jun 2010 17:03:00 +0000 Subject: [PATCH] use "cncolumncolor" (0..9) to render the CN in scoreboard git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5190 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/scoreboard.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index 90876a74..efa4b161 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -135,6 +135,8 @@ void renderdiscscores(int team) } } +VARP(cncolumncolor, 0, 5, 9); + void renderscore(playerent *d) { const char *status = ""; @@ -153,15 +155,15 @@ void renderscore(playerent *d) { case 1: { - if(m_flags) formatstring(s)("%s%d\t%s%s\t%d\t%d\t%d\t%.1f\t%d\t%s\t%s\t%s", spect, d->clientnum, status, colorname(d), d->flagscore, d->frags, d->deaths, ratio, d->points, clag, cping, ign); - else formatstring(s)("%s%d\t%s%s\t%d\t%d\t%.1f\t%d\t%s\t%s\t%s", spect, d->clientnum, status, colorname(d), d->frags, d->deaths, ratio, d->points, clag, cping, ign); + if(m_flags) formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%d\t%.1f\t%d\t%s\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->flagscore, d->frags, d->deaths, ratio, d->points, clag, cping, ign); + else formatstring(s)("%s\fs\f%d%d\fr\t%s%s\t%d\t%d\t%.1f\t%d\t%s\t%s\t%s", spect, cncolumncolor, d->clientnum, status, colorname(d), d->frags, d->deaths, ratio, d->points, clag, cping, ign); break; } case 0: default: { - if(m_flags) formatstring(s)("%s%d\t%d\t%d\t%.1f\t%d\t%s\t%s\t%d\t%s%s%s", spect, d->flagscore, d->frags, d->deaths, ratio, d->points, clag, cping, d->clientnum, status, colorname(d), ign); - else formatstring(s)("%s%d\t%d\t%.1f\t%d\t%s\t%s\t%d\t%s%s%s", spect, d->frags, d->deaths, ratio, d->points, clag, cping, d->clientnum, status, colorname(d), ign); + if(m_flags) formatstring(s)("%s%d\t%d\t%d\t%.1f\t%d\t%s\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->flagscore, d->frags, d->deaths, ratio, d->points, clag, cping, cncolumncolor, d->clientnum, status, colorname(d), ign); + else formatstring(s)("%s%d\t%d\t%.1f\t%d\t%s\t%s\t\fs\f%d%d\fr\t%s%s%s", spect, d->frags, d->deaths, ratio, d->points, clag, cping, cncolumncolor, d->clientnum, status, colorname(d), ign); break; } } @@ -181,8 +183,10 @@ void renderteamscore(teamscore *t) { case 1: { - if(m_flags) formatstring(line.s)("\t\t%d\t%d\t%d\t%.1f\t%d\t\t%s\t%s", t->flagscore, t->frags, t->deaths, ratio, t->points, team_string(t->team), plrs); - else formatstring(line.s)("\t\t%d\t%d\t%.1f\t%d\t\t%s\t%s", t->frags, t->deaths, ratio, t->points, team_string(t->team), plrs); + //if(m_flags) formatstring(line.s)("\t\t%d\t%d\t%d\t%.1f\t%d\t\t%s\t%s", t->flagscore, t->frags, t->deaths, ratio, t->points, team_string(t->team), plrs); + //else formatstring(line.s)("\t\t%d\t%d\t%.1f\t%d\t\t%s\t%s", t->frags, t->deaths, ratio, t->points, team_string(t->team), plrs); + if(m_flags) formatstring(line.s)("%s\t%s\t%d\t%d\t%d\t%.1f\t%d", team_string(t->team), plrs, t->flagscore, t->frags, t->deaths, ratio, t->points); + else formatstring(line.s)("%s\t%s\t%d\t%d\t%.1f\t%d", team_string(t->team), plrs, t->frags, t->deaths, ratio, t->points); break; } case 0: