*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@874 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-04-01 20:52:15 +00:00
parent 0468f92395
commit 56117b3d53
2 changed files with 12 additions and 8 deletions
+5 -3
View File
@@ -80,10 +80,12 @@ vector<sline> scorelines;
void renderscore(void *menu, playerent *d, int cn)
{
const char *status = "";
if(d->ismaster) status = "\f0";
if(d->state==CS_DEAD) status = "\f4";
s_sprintfd(lag)("%d", d->plag);
s_sprintfd(name) ("(%s)", d->name);
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, d->ismaster ? "\f0" : "", d->state==CS_DEAD ? name : 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 : "", d->ismaster ? "\f0" : "", d->state==CS_DEAD ? name : d->name, cn);
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);
}
+7 -5
View File
@@ -185,7 +185,7 @@ void draw_text(const char *str, int left, int top)
glBlendFunc(GL_ONE, GL_ONE);
glBindTexture(GL_TEXTURE_2D, charstex->id);
glColor3ub(255,255,255);
glColor3ub(255, 255, 255);
int x = left, y = top, col = 0;
@@ -205,10 +205,12 @@ void draw_text(const char *str, int left, int top)
case '\f':
switch(str[i+1])
{
case '0': glColor3ub(64,255,128); i++; continue; // green: player talk
case '2': glColor3ub(255,192,64); i++; continue; // yellow: gameplay action messages, only actions done by players
case '3': glColor3ub(255,64,64); i++; continue; // red: important errors
default: continue; // white: everything else
case '0': glColor3ub(64, 255, 128); i++; continue; // green: player talk
case '1': glColor3ub(96, 160, 255); i++; continue; // blue: "echo" command
case '2': glColor3ub(255, 192, 64); i++; continue; // yellow: gameplay action messages, only actions done by players
case '3': glColor3ub(255, 64, 64); i++; continue; // red: important errors
case '4': glColor3ub(128, 128, 128); i++; continue; // gray
default: glColor3ub(255, 255, 255); i++; continue; // white: everything else
}
case ' ':