diff --git a/source/src/menus.cpp b/source/src/menus.cpp index 7188325a..4c12af53 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -19,7 +19,7 @@ void menuset(void *m, bool save) if((curmenu = (gmenu *)m)) curmenu->open(); } -void showmenu_(const char *name, bool top) +void showmenu(const char *name, bool top) { if(!name) { @@ -53,9 +53,9 @@ void closemenu(const char *name) } } -void showmenu(const char *name) +void showmenu_(const char *name) { - showmenu_(name, true); + showmenu(name, true); } void menuselect(void *menu, int sel) @@ -577,7 +577,7 @@ COMMAND(newmenu, ARG_3STR); COMMAND(menumdl, ARG_5STR); COMMAND(menudirlist, ARG_3STR); COMMAND(chmenumdl, ARG_6STR); -COMMAND(showmenu, ARG_1STR); +COMMANDN(showmenu, showmenu_, ARG_1STR); COMMAND(menuinit, ARG_1STR); COMMAND(menuitem, ARG_3STR); COMMAND(menuitemtextinput, ARG_5STR); @@ -880,7 +880,7 @@ void addchange(const char *desc, int type) bool changed = false; loopv(needsapply) if(!strcmp(needsapply[i], desc)) { changed = true; break; } if(!changed) needsapply.add(desc); - showmenu_("apply", false); + showmenu("apply", false); } void clearchanges(int type) diff --git a/source/src/protos.h b/source/src/protos.h index 85a610c4..648a3045 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -102,7 +102,7 @@ extern void *addmenu(const char *name, const char *title = NULL, bool allowinput extern void rendermenumdl(); extern void menuset(void *m, bool save = true); extern void menuselect(void *menu, int sel); -extern void showmenu(const char *name); +extern void showmenu(const char *name, bool top = true); extern void closemenu(const char *name); extern void addchange(const char *desc, int type); extern void clearchanges(int type); diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index 388c910b..6d4f07c0 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -7,7 +7,7 @@ void *scoremenu = NULL, *teammenu = NULL, *ctfmenu = NULL; void showscores(bool on) { - if(on) menuset(m_flags ? ctfmenu : (m_teammode ? teammenu : scoremenu)); + if(on) showmenu(m_flags ? "ctf score" : (m_teammode ? "team score" : "score"), false); else { closemenu("score");