From 33baf20ce84b05be9e43d20adfd53a61a9a4966c Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 26 Jun 2007 20:00:15 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1160 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 1 + source/src/menus.cpp | 30 ++++++++++++++++++++++++++++-- source/src/protos.h | 3 ++- source/src/scoreboard.cpp | 27 +++++++++++++++++++++++---- 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index f3c93eff..ebad8c07 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -553,6 +553,7 @@ void startmap(char *name) // called just after a map load setvar("fogcolour", 0x8099B3); showscores(false); intermission = false; + minutesremaining = -1; if(*clientmap) conoutf("game mode is \"%s\"", modestr(gamemode)); clearbounceents(); } diff --git a/source/src/menus.cpp b/source/src/menus.cpp index dacf7e36..94ebe09b 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -6,7 +6,7 @@ struct mitem { char *text, *action, *hoveraction; }; struct gmenu { - char *name, *title; + char *name, *title, *header, *footer; vector items; int mwidth; int menusel; @@ -86,7 +86,10 @@ bool rendermenu() } char *title = m.title; if(!title) { static string buf; s_sprintf(buf)("[ %s menu ]", m.name); title = buf; } - int offset = m.menusel - (m.menusel%MAXMENU), mdisp = min(m.items.length(), MAXMENU), cdisp = min(m.items.length()-offset, MAXMENU); + int offset = m.menusel - (m.menusel%MAXMENU), + hitems = (m.header ? 1 : 0) + (m.footer ? 1 : 0), + mdisp = min(m.items.length()+hitems, MAXMENU), + cdisp = min(m.items.length()-offset, MAXMENU-hitems); if(m.title) text_startcolumns(); int w = 0; loopv(m.items) @@ -96,6 +99,11 @@ bool rendermenu() } int tw = text_width(title); if(tw>w) w = tw; + if(m.header) + { + int hw = text_width(m.header); + if(hw>w) w = hw; + } int step = (FONTH*5)/4; int h = (mdisp+2)*step; int y = (VIRTH-h)/2; @@ -103,6 +111,11 @@ bool rendermenu() drawmenubg(x-FONTH*3/2, y-FONTH, x+w+FONTH*3/2, y+h+FONTH, true); if(offset>0) drawarrow(1, x+w+FONTH*3/2-FONTH*5/6, y-FONTH*5/6, FONTH*2/3); if(offset+MAXMENU scorelines; +static vector scorelines; +static string modeline, teamline; void renderscore(void *menu, playerent *d, int cn) { @@ -69,6 +70,8 @@ void addteamscore(playerent *d) void renderscores(void *menu, bool init) { + modeline[0] = '\0'; + teamline[0] = '\0'; scorelines.setsize(0); vector scores; @@ -83,15 +86,29 @@ 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()); + } + extern int minutesremaining; + if((gamemode>1 || (gamemode==0 && multiplayer(false))) && minutesremaining >= 0) + { + if(!minutesremaining) s_strcat(modeline, ", intermission"); + else + { + s_sprintfd(timestr)(", %d %s remaining", minutesremaining, minutesremaining==1 ? "minute" : "minutes"); + s_strcat(modeline, timestr); + } + } + if(m_teammode) { - menumanual(menu, scorelines.length(), ""); teamscores.setsize(0); loopv(players) addteamscore(players[i]); if(!demoplayback) addteamscore(player1); teamscores.sort(teamscorecmp); - string &teamline = scorelines.add().s; - teamline[0] = 0; loopv(teamscores) { string s; @@ -101,5 +118,7 @@ void renderscores(void *menu, bool init) } } loopv(scorelines) menumanual(menu, i, scorelines[i].s); + + menuheader(menu, modeline, teamline); }