diff --git a/source/src/clientextras.cpp b/source/src/clientextras.cpp index 58837e0f..c97c7fb0 100644 --- a/source/src/clientextras.cpp +++ b/source/src/clientextras.cpp @@ -80,10 +80,12 @@ vector 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); } diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp index a63f234d..42d81de8 100644 --- a/source/src/rendertext.cpp +++ b/source/src/rendertext.cpp @@ -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 ' ':