diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index 3cbd08c8..4232bced 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -7,7 +7,7 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts); } -VARP(equiptransparency, 0, 0, 1); +VARP(equiptransparency, 0, 0, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection void drawequipicon(float x, float y, int col, int row, float blend) { diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index efa4b161..d4555693 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -245,7 +245,15 @@ void renderscores(void *menu, bool init) if(s) { if(servstate.mastermode > MM_OPEN) concatformatstring(serverline, servstate.mastermode == MM_MATCH ? "M%d " : "P ", servstate.matchteamsize); - concatformatstring(serverline, "%s:%d %s", s->name, s->port, s->sdesc); + // ft: 2010jun12: this can write over the menu boundary + //concatformatstring(serverline, "%s:%d %s", s->name, s->port, s->sdesc); + // for now we'll just cut it off, same as the serverbrowser + // but we might want to consider wrapping the bottom-line to accomodate longer descriptions - to a limit. + string text; + filtertext(text, s->sdesc); + for(char *p = text; (p = strchr(p, '\"')); *p++ = ' '); + text[38] = '\0'; // serverbrowser has less room - +8 chars here + concatformatstring(serverline, "%s:%d %s", s->name, s->port, text); } }