kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scoreboard fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1429 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-11-17 10:13:19 +00:00
parent 6441042f35
commit e0f78a5255
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/menus.cpp
+3 -3
View File
@@ -80,7 +80,7 @@ void rendermenu()
}
char *title = m.title;
if(!title) { static string buf; s_sprintf(buf)("[ %s menu ]", m.name); title = buf; }
int hitems = (m.header ? 1 : 0) + (m.footer ? 1 : 0),
int hitems = (m.header ? 2 : 0) + (m.footer ? 2 : 0),
pagesize = MAXMENU - hitems,
offset = m.menusel - (m.menusel%pagesize),
mdisp = min(m.items.length(), pagesize),
@@ -109,7 +109,7 @@ void rendermenu()
if(m.header)
{
draw_text(m.header, x, y);
y += step;
y += step*2;
}
draw_text(title, x, y);
y += step*2;
@@ -128,7 +128,7 @@ void rendermenu()
if(m.title) text_endcolumns();
if(m.footer)
{
y += (mdisp-cdisp)*step;
y += ((mdisp-cdisp)+1)*step;
draw_text(m.footer, x, y);
}
}
source/src/scoreboard.cpp
+5 -4
View File
@@ -75,8 +75,10 @@ void renderscore(void *menu, playerent *d)
void renderteamscore(void *menu, teamscore *t)
{
if(!scorelines.empty()) scorelines.add(); // space between teams
sline &line = scorelines.add();
if(m_teammode) s_sprintf(line.s)("%d\t%d\t\t\t\t%s\t\t(%d players)", t->frags, t->deaths, team_string(t->team), t->teammembers.length());
s_sprintfd(plrs)("(%d %s)", t->teammembers.length(), t->teammembers.length() == 1 ? "player" : "players");
if(m_teammode) s_sprintf(line.s)("%d\t%d\t\t\t\t%s\t\t%s", t->frags, t->deaths, team_string(t->team), plrs);
static color teamcolors[2] = { color(1, 0, 0, 0.2f), color(0, 0, 1, 0.2f) };
line.bgcolor = &teamcolors[t->team];
loopv(t->teammembers) renderscore(menu, t->teammembers[i]);
@@ -101,11 +103,10 @@ void renderscores(void *menu, bool init)
if(sel>=0) menuselect(menu, sel);
}
s_strcat(modeline, modestr(gamemode));
if(getclientmap()[0])
{
s_strcat(modeline, ": ");
s_strcat(modeline, getclientmap());
bool fldrprefix = !strncmp(getclientmap(), "maps/", strlen("maps/"));
s_sprintf(modeline)("\"%s\" on map %s", modestr(gamemode), fldrprefix ? getclientmap()+strlen("maps/") : getclientmap());
}
extern int minutesremaining;