diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 121972e6..4765c616 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -56,6 +56,13 @@ char *colorname(playerent *d, int num, char *name, char *prefix) return cname[num]; } +char *colorping(int ping) +{ + static string cping; + s_sprintf(cping)("\fs\f%d%d\fr", ping <= 500 ? 0 : ping <= 700 ? 2 : 3, ping); + return cping; +} + void newname(char *name) { if(name[0]) @@ -65,7 +72,7 @@ void newname(char *name) if(!player1->name[0]) s_strcpy(player1->name, "unarmed"); } else conoutf("your name is: %s", player1->name); -} +} int smallerteam() { diff --git a/source/src/protos.h b/source/src/protos.h index c352fb6c..05b3efc3 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -158,6 +158,7 @@ extern void respawn(); extern void serveropcommand(int cmd, int arg1); extern void refreshsopmenu(void *menu, bool init); extern char *colorname(playerent *d, int num = 0, char *name = NULL, char *prefix = ""); +extern char *colorping(int ping); // scoreboard extern void showscores(bool on); @@ -307,7 +308,6 @@ extern void renderclient(playerent *d, char *mdlname, char *vwepname, int tex = // hudgun extern char *gunnames[]; - extern void renderhudgun(); // weapon @@ -375,6 +375,8 @@ extern void putint(ucharbuf &p, int n); extern int getint(ucharbuf &p); extern void putuint(ucharbuf &p, int n); extern int getuint(ucharbuf &p); +extern void putfloat(ucharbuf &p, float n); +extern float getfloat(ucharbuf &p); extern void sendstring(const char *t, ucharbuf &p); extern void getstring(char *t, ucharbuf &p, int len = MAXTRANS); extern void filtertext(char *dst, const char *src, bool whitespace = true, int len = sizeof(string)-1); diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index d83a6a8b..f2c40f70 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -23,9 +23,9 @@ void renderscore(void *menu, playerent *d, int cn) else if(d->state==CS_DEAD) status = "\f4"; s_sprintfd(lag)("%d", d->plag); string &s = scorelines.add().s; - if(m_ctf) s_sprintf(s)("%d\t%d\t%d\t%s\t%d\t%s\t%s%s\t%d", d->flagscore, d->frags, d->lifesequence, d->state==CS_LAGGED ? "LAG" : lag, d->ping, d->team, status, colorname(d), cn); - else if(m_teammode) s_sprintf(s)("%d\t%d\t%s\t%d\t%s\t%s%s\t%d", d->frags, d->lifesequence, d->state==CS_LAGGED ? "LAG" : lag, d->ping, m_teammode ? d->team : "", status, colorname(d), cn); - else s_sprintf(s)("%d\t%d\t%s\t%d\t%s%s\t%d", d->frags, d->lifesequence, d->state==CS_LAGGED ? "LAG" : lag, d->ping, status, colorname(d), cn); + if(m_ctf) s_sprintf(s)("%d\t%d\t%d\t%s\t%s\t%s\t%s%s\t%d", d->flagscore, d->frags, d->lifesequence, d->state==CS_LAGGED ? "LAG" : lag, colorping(d->ping), d->team, status, colorname(d), cn); + else if(m_teammode) s_sprintf(s)("%d\t%d\t%s\t%s\t%s\t%s%s\t%d", d->frags, d->lifesequence, d->state==CS_LAGGED ? "LAG" : lag, colorping(d->ping), m_teammode ? d->team : "", status, colorname(d), cn); + else s_sprintf(s)("%d\t%d\t%s\t%s\t%s%s\t%d", d->frags, d->lifesequence, d->state==CS_LAGGED ? "LAG" : lag, colorping(d->ping), status, colorname(d), cn); } static int scorecmp(const playerent **x, const playerent **y)