kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust in-game menus

Browse Source 
Introduced common parts of In-game and In-game admin menus, fixed showing
player skin in In-game admin menu (thx BrutalSystem).
This commit is contained in:
aurhat
2016-10-01 22:03:55 +02:00
committed by ac-stef
parent 07d9ae608d
commit ab27d952d6
1 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_multiplayer.cfg
+50 -44
View File
@@ -14,59 +14,65 @@ const joinservermenu [
showmenu server
]
// Normal in-game menu that opens when pressing escape and connected to a game.
newmenu [In-game]
// Common parts of in-game menus
tempalias __ingamemenu_1 [
push t (player1 team)
menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ]
menuitem [Change weapon...] [ showmenu Weapons ] [ __ingamemenu_showmodel 0 ]
menuitem [Change player skin...] (concat showmenu (at [CLA RVSF] (&b $t 1))) [ __ingamemenu_showmodel 1 ]
menuitem [Change to the enemy team] changeteam [ __ingamemenu_showmodel 0 ]
menuitem (concat Change to (at "spectate active" (> $t 1)) mode) spectate
pop t
]
menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ] [ __ingamemenu_showmodel [In-game] 0 ]
menuitem [Change weapon...] [ showmenu Weapons ] [ __ingamemenu_showmodel [In-game] 0 ]
menuitem [Change to the enemy team] changeteam [ __ingamemenu_showmodel [In-game] 0 ]
menuitemvar [result (concat [Change to] (if (> (player1 team) 1) [ result active ] [ result spectate]) mode)] spectate [ __ingamemenu_showmodel [In-game] 0 ]
menuitem [Change player skin...] [showmenu (at [CLA RVSF] (player1 team))] [ __ingamemenu_showmodel [In-game] 1 ]
menuitem [] -1 [__ingamemenu_showmodel [In-game] 0]
menuitem [Set mode/map...] [ showmenu Gamemode ]
// menuitem "Kick/ban player..." [ showmenu kick/ban ] // only noobish vote abusers use this, if you really want it, just uncomment
menuitem [Ignore/Unignore all...] [ if $ingall [ unignoreall ] [ ignoreall ] ]
menuitem [Adjust teams...] [ showmenu [Team adjustment] ]
menuitem [Download a demo...] [ listdemos; showmenu [Download demo] ]
menuitem [Get additional server information] [ showmenu serverinfo ]
menuitem [] -1
menuitem "\f4Main menu..." [ closecurmenu; showmenu main ]
menuitem "\f4Browse servers..." [ closecurmenu; joinservermenu ]
menuitem "\f3Disconnect from server" disconnect
menuitem "\f3Quit AssaultCube" savequit
menuinitselection 13
tempalias __ingamemenu_2 [
menuitem [Get additional server information] [ showmenu serverinfo ]
menuitem [Download a demo...] [ listdemos; showmenu [Download demo] ]
menuitem [] -1
menuitem "\f4Main menu..." [ closecurmenu; showmenu main ]
menuitem "\f4Browse servers..." [ closecurmenu; joinservermenu ]
menuitem "\f3Disconnect from server" disconnect
menuitem "\f3Quit AssaultCube" savequit
]
const __ingamemenu_showmodel [
if (&& (< (player1 team) 4) $arg2) [
chmenumdl $arg1 (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (player1 team)) "/0" (+ 1 (player1 skin))) idle 15 3
if (&& (< (player1 team) 4) $arg1) [
chmenumdl (curmenu) (concatword "playermodels/" (at [CLA RVSF CLA RVSF] (player1 team)) "/0" (+ 1 (player1 skin))) idle 15 3
] [
chmenumdl $arg1
chmenumdl (curmenu)
]
]
// Normal in-game menu that opens when pressing escape and connected to a game.
newmenu [In-game]
menuinit [
resetcurmenu
__ingamemenu_1
menuitem [] -1
menuitem [Set mode/map...] [ showmenu Gamemode ]
// menuitem "Kick/ban player..." [ showmenu kick/ban ] // only noobish vote abusers use this, if you really want it, just uncomment
menuitem [Ignore/Unignore all...] [ if $ingall [ unignoreall ] [ ignoreall ] ]
menuitem [Adjust teams...] [ showmenu [Team adjustment] ]
__ingamemenu_2
]
menuinitselection 13
// In-game menu that opens if when you press escape if you're admin state and connected to a game.
newmenu [In-game admin]
menuitem [Set mode/map...] [ showmenu Gamemode ]
menuitem [Kick/ban player...] [ showmenu kick/ban ]
menuitem [Adjust teams...] [ showmenu [Team adjustment] ]
menuitem [Change mastermode...] [ showmenu Mastermode ]
menuitem [Change the server description...] [ saycommand "/serverdesc " ]
menuitem [Find a players IP address...] [ saycommand "/whois " ]
menuitem [Give admin...] [ showmenu [give admin] ]
menuitem [] -1
menuitemtextinput [Nickname: ] "result $curname" [ name $arg1 ]
menuitem [Change weapon...] [ showmenu Weapons ] [ __ingamemenu_showmodel [In-game admin] 0 ]
menuitem [Change to the enemy team] changeteam [ __ingamemenu_showmodel [In-game admin] 1 ]
menuitemvar [result (concat [Change to] (if (> (player1 team) 1) [ result active ] [ result spectate ]) mode)] spectate [ __ingamemenu_showmodel [In-game admin] 1 ]
menuitem [Change player skin...] [ showmenu (at [CLA RVSF] (player1 team)) ] [ __ingamemenu_showmodel [In-game admin] 1 ]
menuitem [Download a demo...] [ listdemos; showmenu [Download demo] ]
menuitem [] -1
menuitem "\f4Main menu..." [ closecurmenu; showmenu main ]
menuitem "\f4Browse servers..." [ closecurmenu; joinservermenu ]
menuitem "\f3Disconnect from server" disconnect
menuitem "\f3Quit AssaultCube" savequit
menuinitselection 16
menuinit [
resetcurmenu
menuitem [Set mode/map...] [ showmenu Gamemode ]
menuitem [Kick/ban player...] [ showmenu kick/ban ]
menuitem [Adjust teams...] [ showmenu [Team adjustment] ]
menuitem [Change mastermode...] [ showmenu Mastermode ]
menuitem [Change the server description...] [ saycommand "/serverdesc " ]
menuitem [Find a players IP address...] [ saycommand "/whois " ]
menuitem [Give admin...] [ showmenu [give admin] ]
menuitem [] -1
__ingamemenu_1
__ingamemenu_2
]
menuinitselection 17
// Multiplayer menu only opens through the main menu (when disconnected).
newmenu multiplayer