From 98675e4ce12dca3f6d20121021a9ec3126ae9d78 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Tue, 28 Nov 2006 04:01:36 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@745 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientextras.cpp | 3 ---
 source/src/main.cpp         | 5 ++---
 source/src/menus.cpp        | 3 +--
 source/src/protos.h         | 1 +
 source/src/renderextras.cpp | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/source/src/clientextras.cpp b/source/src/clientextras.cpp
index 0f495273..b6674fbe 100644
--- a/source/src/clientextras.cpp
+++ b/source/src/clientextras.cpp
@@ -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());
diff --git a/source/src/main.cpp b/source/src/main.cpp
index a8afe740..2e378aad 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -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);
 
diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index b05201b4..21e8e547 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -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;
diff --git a/source/src/protos.h b/source/src/protos.h
index 29e500b8..d25c1c6b 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -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
diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp
index 5d835b74..e47bfa92 100644
--- a/source/src/renderextras.cpp
+++ b/source/src/renderextras.cpp
@@ -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;