*** empty log message ***
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@745 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -73,12 +73,10 @@ void renderclients()
|
||||
|
||||
// creation of scoreboard pseudo-menu
|
||||
|
||||
bool scoreson = false;
|
||||
void *scoremenu = NULL, *ctfmenu = NULL;
|
||||
|
||||
void showscores(bool on)
|
||||
{
|
||||
scoreson = on;
|
||||
menuset(on ? (m_ctf ? ctfmenu : scoremenu) : NULL);
|
||||
};
|
||||
|
||||
@@ -127,7 +125,6 @@ void addteamscore(playerent *d)
|
||||
|
||||
void renderscores()
|
||||
{
|
||||
if(!scoreson) return;
|
||||
void *menu = m_ctf ? ctfmenu : scoremenu;
|
||||
scorelines.setsize(0);
|
||||
if(!demoplayback) renderscore(menu, player1, getclientnum());
|
||||
|
||||
+2
-3
@@ -299,10 +299,9 @@ int main(int argc, char **argv)
|
||||
|
||||
log("cfg");
|
||||
extern void *scoremenu, *servmenu, *ctfmenu, *kickmenu, *banmenu;
|
||||
scoremenu = addmenu("frags\tpj\tping\tteam\tname", false, false);
|
||||
extern void refreshservers();
|
||||
scoremenu = addmenu("frags\tpj\tping\tteam\tname", false, false, renderscores);
|
||||
servmenu = addmenu("ping\tplr\tserver", true, false, refreshservers);
|
||||
ctfmenu = addmenu("flags\tfrags\tpj\tping\tteam\tname", false, false);
|
||||
ctfmenu = addmenu("flags\tfrags\tpj\tping\tteam\tname", false, false, renderscores);
|
||||
kickmenu = addmenu("kick player", true, false);
|
||||
banmenu = addmenu("ban player", true, false);
|
||||
|
||||
|
||||
@@ -58,9 +58,8 @@ bool rendermenu()
|
||||
|
||||
setscope(false);
|
||||
|
||||
if(curmenu->refreshfunc) (*curmenu->refreshfunc)();
|
||||
|
||||
gmenu &m = *curmenu;
|
||||
if(m.refreshfunc) (*m.refreshfunc)();
|
||||
s_sprintfd(title)(m.hastitle ? "[ %s menu ]" : "%s", m.name); // EDIT: AH
|
||||
int mdisp = m.items.length();
|
||||
int w = 0;
|
||||
|
||||
@@ -39,6 +39,7 @@ extern void addserver(char *servername);
|
||||
extern char *getservername(int n);
|
||||
extern bool resolverwait(const char *name, ENetAddress *address);
|
||||
extern void writeservercfg();
|
||||
extern void refreshservers();
|
||||
|
||||
// rendergl
|
||||
struct Texture
|
||||
|
||||
@@ -342,7 +342,6 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
|
||||
else if(closeent[0]) draw_text(closeent, 20, 1570);
|
||||
else if(player) draw_text(player->name, 20, 1570);
|
||||
|
||||
renderscores();
|
||||
if(!rendermenu())
|
||||
{
|
||||
bool teammate_in_xhair = player ? (isteam(player->team, player1->team) && player->state!=CS_DEAD) : false;
|
||||
|
||||
Reference in New Issue
Block a user