A different menu opens if you're an admin and press ESC in game :D

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3072 e016b1c5-ed68-44aa-a2f7-31cac88cffde

config/keymap.cfg

@@ -10,7 +10,7 @@ keymap 9 TAB "showscores"
 keymap 12 CLEAR ""
 keymap 13 RETURN ""
 keymap 19 PAUSE ""
-keymap 27 ESCAPE [ if $connected [ showmenu "In-game" ] [ showmenu main ] ]
+keymap 27 ESCAPE [ if $connected [ ingamemenu ] [ showmenu main ] ]
 keymap 32 SPACE "jump"
 keymap 33 EXCLAIM ""
 keymap 34 QUOTEDBL ""

config/menus_multiplayer.cfg

@@ -1,12 +1,11 @@
-// Menu that is shown when escape is pressed connected in-game
+// Decides wether to open the admin or normal in-game menu.
+alias ingamemenu [ if (currole 1) [ showmenu "In-game admin" ] [ showmenu In-game ] ]
 
+// Normal in-game menu that opens when pressing escape and connected to a game.
 newmenu "In-game"
 
-// menuinit [ if $adminstatus 1 [ showmenu "In-game admin menu" ] [ showmenu In-game ] ]
-// This option is an idea, also awaiting code by meatrome....
 menuitemtextinput "Nickname:  " "result $curname" "name $arg1"
-// menuitem "Change to the enemy team"        [ if $team 1 [ team CLA ] [ team RVSF ] ]
-// This option is awaiting a variable to be coded by meatrome tomorrow... this is probably a better/easier team change menuitem.
+menuitem "Change to the enemy team"        [ if (curteam 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
 menuitem "Change weapon"        	"showmenu Weapons"
 menuitem "Change player skin"          [showmenu (at [CLA RVSF] (curteam))]
 menuitem "" ""
@@ -20,28 +19,26 @@ menuitem "Disconnect"			"disconnect"
 menuitem "2Go back to Main Menu"		"showmenu main"
 
 
+// In-game menu that opens if when you press escape if you're admin state and connected to a game.
+newmenu "In-game admin"
 
-newmenu "In-game admin menu"
-
-// I'll finish this part later...
-menuitemtextinput "Nickname:  " "result $curname" "name $arg1"
-// menuitem "Change to the enemy team"        [ if $team 1 [ team CLA ] [ team RVSF ] ]
-// This option is awaiting a variable to be coded by meatrome tomorrow... this is probably a better/easier team change menuitem.
-menuitem "Change weapon"        	"showmenu Weapons"
-menuitem "Change player skin"          [showmenu (at [CLA RVSF] (curteam))]
-menuitem "" ""
 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 "Demos"			"showmenu demo"
+menuitem "Give admin"			[ showmenu "give admin" ]
 menuitem ""
+menuitemtextinput "Nickname:  " "result $curname" "name $arg1"
+menuitem "Change to the enemy team"        [ if (curteam 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
+menuitem "Change weapon"        	"showmenu Weapons"
+menuitem "Change player skin"          [showmenu (at [CLA RVSF] (curteam))]
+menuitem "Demos"			"showmenu demo"
+menuitem "" ""
 menuitem "Disconnect"			"disconnect"
 menuitem "2Go back to Main Menu"		"showmenu main"
 
 
-// Multiplayer menu only used when disconnected
-
+// Multiplayer menu only opens through the main menu (when disconnected).
 newmenu multiplayer
 
 menuitem "Join a server"		"searchlan 1; showallservers 1; updatefrommaster; showmenu server"
@@ -51,7 +48,7 @@ menuitem "Admin connect"		[ showmenu "Admin connect" ]
 menuitem "
 menuitem "Force serverlist update"	"updatefrommaster 1; showmenu server"
 
-
+// Fancy custom connect menu.
 newmenu "Custom connect"
 
 menuinit [ alias cc1 ""; alias cc2 ""; alias cc3 "" ]	// Resets the aliases
@@ -61,7 +58,7 @@ menuitemtextinput "Server password (optional): 	"	"" "alias cc3 $arg1"
 menuitem ""
 menuitem "2			  [ Connect ]				" "connect $cc1 $cc2 $cc3"
 
-
+// Connect to a menu as admin.
 newmenu "Admin connect"
 
 menuinit [ alias acc1 ""; alias acc2 ""; alias acc3 ""; echo "3To use this menu to connect as administrator, you will need to know the administrator password for your server." ]	// Resets the aliases

config/menus_settings.cfg

@@ -43,9 +43,9 @@ menuitem "Reset all settings"                          [ showmenu "Reset ALL set
 
 newmenu "QUICK setup"
 
-menuitemtextinput "Nickname: " 		"" "name $arg1"
+menuitemtextinput "Nickname:  " 		"" "name $arg1"
 menuitemtextinput "Resolution (Width):  " "$scr_w" "scr_w $arg1"
-menuitemtextinput "Resolution (Height): " "$scr_h" "scr_h $arg1"
+menuitemtextinput "Resolution (Height):  " "$scr_h" "scr_h $arg1"
 menuitemslider "Mouse sensitivity: " 2 150 "($sensitivity)" 2 "" "sensitivity $arg1"
 menuitemslider "Graphics detail: " 1 4 "(getgfxq)" 1 "low medium good best" "new_gfx_quality $arg1"
 menuitemslider "Sound detail: " 1 3 "(getsoundq)" 1 "low medium high" "new_sound_quality $arg1"
@@ -333,8 +333,7 @@ menuitemcheckbox "Auto weapon reload: " "$autoreload" "autoreload $arg1"
 menuitemcheckbox "Non-violence mode: " "(getponiesmode)" "new_poniesmode $arg1"
 menuitemcheckbox "Show gamemodes as acronyms: " "$modeacronyms" "modeacronyms $arg1"
 menuitemcheckbox "Show quit dialog when quitting: " "$askquit" "askquit = $arg1"
-// menuitem "Change to the enemy team"        [ if $myteam 1 [ team CLA ] [ team RVSF ] ]
-// This commented script is awaiting variables for "team" which meatrome will add tomorrow.
+menuitem "Change to the enemy team"        [ if (curteam 1) [ team CLA; echo "You are now on team CLA" ] [ team RVSF; echo "You are now on team RVSF" ] ]
 menuitem "Change weapon"        "showmenu Weapons"
 menuitem "Change player skin"          [showmenu (at [CLA RVSF] (curteam))]
 

config/resetbinds.cfg

@@ -13,7 +13,7 @@ bind TAB "showscores"
 bind CLEAR ""
 bind RETURN ""
 bind PAUSE ""
-bind ESCAPE [ if $connected [ showmenu "In-game" ] [ showmenu main ] ]
+bind ESCAPE [ if $connected [ ingamemenu ] [ showmenu main ] ]
 bind SPACE "jump"
 bind EXCLAIM ""
 bind QUOTEDBL ""