From 16a6f82490c9f76d9e2192877058f5bf213eb798 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Thu, 5 Apr 2007 00:30:33 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@924 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus.cfg | 4 ++-- source/src/clientgame.cpp | 18 +++++++----------- source/src/main.cpp | 4 ++-- source/src/menus.cpp | 6 +++--- source/src/protos.h | 7 ++++--- source/src/scoreboard.cpp | 21 ++++++++++----------- source/src/serverbrowser.cpp | 4 ++-- 7 files changed, 30 insertions(+), 34 deletions(-) diff --git a/config/menus.cfg b/config/menus.cfg index bdafc76e..2f1d3227 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -209,8 +209,8 @@ menuitem "Become Master" "setmaster 1" menuitem "Give Up Master" "setmaster 0" menuitem "Set Mastermode" "showmenu mastermode" menuitem "Change Mode/Map" "showmenu gamemode" -menuitem "Kick Player" "showmastermenu 0" -menuitem "Ban Player" "showmastermenu 1" +menuitem "Kick Player" [showmenu "kick player"] +menuitem "Ban Player" [showmenu "ban player"] menuitem "Remove Bans" "removebans" diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index a33aabd7..deadcad0 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -692,21 +692,17 @@ static vector mlines; void *kickmenu = NULL, *banmenu = NULL; -void showmastermenu(int m) // 0=kick, 1=ban +void refreshmastermenu(void *menu, bool init) { - void *menu = m==MCMD_KICK ? kickmenu : banmenu; - int item = 0; + if(!init) return; + int item = 0; mlines.setsize(0); - loopv(players) if(players[i]) - { + loopv(players) if(players[i]) + { string &s = mlines.add().cmd; - s_sprintf(s)("%s %d", m == MCMD_KICK ? "kick" : "ban", i); + s_sprintf(s)("%s %d", menu==kickmenu ? "kick" : "ban", i); menumanual(menu, item++, players[i]->name, s); - } - menuset(menu); + } } -COMMAND(showmastermenu, ARG_1INT); - - diff --git a/source/src/main.cpp b/source/src/main.cpp index fe11d55d..1ffd0324 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -258,8 +258,8 @@ int main(int argc, char **argv) teammenu = addmenu("team score", "frags\tpj\tping\tteam\tname\tcn", false, renderscores); ctfmenu = addmenu("ctf score", "flags\tfrags\tpj\tping\tteam\tname\tcn", false, renderscores); servmenu = addmenu("server", "ping\tplr\tserver", true, refreshservers); - kickmenu = addmenu("kick player"); - banmenu = addmenu("ban player"); + kickmenu = addmenu("kick player", NULL, true, refreshmastermenu); + banmenu = addmenu("ban player", NULL, true, refreshmastermenu); persistidents = false; exec("config/keymap.cfg"); diff --git a/source/src/menus.cpp b/source/src/menus.cpp index e4ae5a20..00c851ce 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -13,7 +13,7 @@ struct gmenu char *mdl; // (optional) md2 mdl int anim, rotspeed, scale; bool allowinput, inited; - void (__cdecl *refreshfunc)(bool); + void (__cdecl *refreshfunc)(void *, bool); }; hashtable menus; @@ -73,7 +73,7 @@ bool rendermenu() gmenu &m = *curmenu; if(m.refreshfunc) { - (*m.refreshfunc)(!m.inited); + (*m.refreshfunc)(curmenu, !m.inited); m.inited = true; if(m.menusel>=m.items.length()) m.menusel = max(m.items.length()-1, 0); } @@ -149,7 +149,7 @@ void rendermenumdl() glPopMatrix(); } -void *addmenu(char *name, char *title, bool allowinput, void (__cdecl *refreshfunc)(bool)) +void *addmenu(char *name, char *title, bool allowinput, void (__cdecl *refreshfunc)(void *, bool)) { name = newstring(name); gmenu &menu = menus[name]; diff --git a/source/src/protos.h b/source/src/protos.h index e129e3cd..fd5f689a 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -29,7 +29,7 @@ extern void conoutf(const char *s, ...); extern bool rendermenu(); extern void menumanual(void *menu, int n, char *text, char *action=NULL); extern bool menukey(int code, bool isdown); -extern void *addmenu(char *name, char *title = NULL, bool allowinput = true, void (__cdecl *refreshfunc)(bool) = NULL); +extern void *addmenu(char *name, char *title = NULL, bool allowinput = true, void (__cdecl *refreshfunc)(void *, bool) = NULL); extern void rendermenumdl(); extern void menuset(void *m); extern void menuselect(void *menu, int sel); @@ -39,7 +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(bool init); +extern void refreshservers(void *menu, bool init); // rendergl extern void gl_init(int w, int h, int bpp, int depth, int fsaa); @@ -135,10 +135,11 @@ extern void flagmsg(int flag, int action); extern void arenarespawn(); extern void respawn(); extern void mastercommand(int cmd, int arg1); +extern void refreshmastermenu(void *menu, bool init); // scoreboard extern void showscores(bool on); -extern void renderscores(bool init); +extern void renderscores(void *menu, bool init); // world extern void setupworld(int factor); diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index 86c57e6d..ae323146 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -27,6 +27,15 @@ void renderscore(void *menu, playerent *d, int cn) menumanual(menu, scorelines.length()-1, s); } +static int scorecmp(const playerent **x, const playerent **y) +{ + if((*x)->flagscore > (*y)->flagscore) return -1; + if((*x)->flagscore < (*y)->flagscore) return 1; + if((*x)->frags > (*y)->frags) return -1; + if((*x)->frags < (*y)->frags) return 1; + return 0; +} + struct teamscore { char *team; @@ -44,15 +53,6 @@ static int teamscorecmp(const teamscore *x, const teamscore *y) return 0; } -static int scorecmp(const playerent **x, const playerent **y) -{ - if((*x)->flagscore > (*y)->flagscore) return -1; - if((*x)->flagscore < (*y)->flagscore) return 1; - if((*x)->frags > (*y)->frags) return -1; - if((*x)->frags < (*y)->frags) return 1; - return 0; -} - vector teamscores; void addteamscore(playerent *d) @@ -67,9 +67,8 @@ void addteamscore(playerent *d) teamscores.add(teamscore(d->team, d->frags, m_ctf ? d->flagscore : 0)); } -void renderscores(bool init) +void renderscores(void *menu, bool init) { - void *menu = m_ctf ? ctfmenu : (m_teammode ? teammenu : scoremenu); scorelines.setsize(0); vector scores; diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp index 7dd53913..3cba379b 100644 --- a/source/src/serverbrowser.cpp +++ b/source/src/serverbrowser.cpp @@ -321,7 +321,7 @@ int sicompare(const serverinfo *a, const serverinfo *b) void *servmenu = NULL; -void refreshservers(bool init) +void refreshservers(void *menu, bool init) { if(init) { @@ -352,7 +352,7 @@ void refreshservers(bool init) } si.full[50] = 0; // cut off too long server descriptions s_sprintf(si.cmd)("connect %s", si.name); - menumanual(servmenu, i, si.full, si.cmd); + menumanual(menu, i, si.full, si.cmd); } }