diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index c0908173..46d34cda 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -25,6 +25,7 @@ menuitem " 4Main menu..." [ closemenu In-game; showmenu main ] menuitem " 4Browse servers..." [ closemenu "In-game"; joinservermenu ] menuitem " 3Disconnect from server" "disconnect" menuitem " 3Quit AssaultCube" "savequit" +menuinitselection 11 // In-game menu that opens if when you press escape if you're admin state and connected to a game. newmenu "In-game admin" @@ -140,6 +141,7 @@ newmenu "search player" menuitemtextinput "search nickname: " "result $lastsearchname" "alias lastsearchname $arg1" menuitem " [search]" [closemenu "search player"; searchnickname $lastsearchname] +menuinitselection 1 newmenu voicecom 1 1 diff --git a/source/src/menus.cpp b/source/src/menus.cpp index 01e93d1e..26e147c5 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -597,6 +597,12 @@ void menuinit(char *initaction) lastmenu->initaction = newstring(initaction); } +void menuinitselection(int line) +{ + if(!lastmenu) return; + if(lastmenu->items.inrange(line)) lastmenu->menusel = line; +} + void menuitem(char *text, char *action, char *hoveraction) { if(!lastmenu) return; @@ -693,6 +699,7 @@ COMMAND(chmenumdl, ARG_6STR); COMMANDN(showmenu, showmenu_, ARG_1STR); COMMAND(closemenu, ARG_1STR); COMMAND(menuinit, ARG_1STR); +COMMAND(menuinitselection, ARG_1INT); COMMAND(menuitem, ARG_3STR); COMMAND(menuitemvar, ARG_3STR); COMMAND(menuitemimage, ARG_4STR);