From 26d596e95dd1ea4be927440ddc33088fc3d26f1a Mon Sep 17 00:00:00 2001
From: RandumKiwi <RandumKiwi@users.noreply.github.com>
Date: Wed, 15 Oct 2008 07:22:08 +0000
Subject: [PATCH] New in-game menus

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3030 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/keymap.cfg            |  2 +-
 config/menus_multiplayer.cfg | 57 ++++++++++++++++++++++++++----------
 config/resetbinds.cfg        |  2 +-
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/config/keymap.cfg b/config/keymap.cfg
index 919aca84..6bff1bfc 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -10,7 +10,7 @@ keymap 9 TAB "showscores"
 keymap 12 CLEAR ""
 keymap 13 RETURN ""
 keymap 19 PAUSE ""
-keymap 27 ESCAPE "showmenu main"
+keymap 27 ESCAPE [ if $connected [ showmenu "In-game" ] [ showmenu main ] ]
 keymap 32 SPACE "jump"
 keymap 33 EXCLAIM ""
 keymap 34 QUOTEDBL ""
diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg
index 410303d7..6fdab94c 100644
--- a/config/menus_multiplayer.cfg
+++ b/config/menus_multiplayer.cfg
@@ -1,23 +1,48 @@
+//Menu that is shown when escape is pressed connected in-game.
+newmenu "In-game"
+
+menuitem "Change mode/map"		"showmenu Gamemode"
+menuitem "Kick/ban player"		"showmenu kick/ban"
+menuitem "Adjust teams"			[ showmenu "Team adjustment" ]
+menuitem "Change mastermode" 		"showmenu Mastermode"
+menuitem "Disconnect"			"disconnect"
+menuitem "Change settings"		"showmenu settings"
+menuitem "Demos"			"showmenu demo"
+menuitem "Chat"				"saycommand"
+menuitem "Team Chat"			"saycommand %"
+menuitem "Voice Coms"			"showmenu voicecom"
+menuitem ""
+menuitem "Go to the main menu"		"showmenu main"
+
+
+// Multiplayer menu only used when disconnected.
 newmenu multiplayer
 
 menuitem "Join a server"		"searchlan 1; showallservers 1; updatefrommaster; showmenu server"
-menuitem "Join a LAN server"	"searchlan 2; showallservers 0; showmenu server"
-menuitem "Disconnect"			"disconnect"
-menuitem "Server voting..."		[ showmenu "Server voting" ]
-menuitem "Chat"				"saycommand"
-menuitem "Team Chat"			"saycommand %"
-menuitem "VoiceCom"			"showmenu voicecom"
+menuitem "Join a LAN server"		"searchlan 2; showallservers 0; showmenu server"
+menuitem "Custom connect"		[ showmenu "Custom connect" ]
+menuitem "Force servers to update"	"updatefrommaster"
 
-newmenu "Server voting"
+newmenu "Custom connect"
 
-menuitem "Vote to change mode/map" 		"showmenu Gamemode"
-menuitem "Vote to change mastermode" 		"showmenu Mastermode"
-menuitem "Vote to force a team change" 		[ showmenu "force team" ]
-menuitem "Vote to kick a player"		[showmenu "kick player"]
-menuitem "Vote to ban a player" 		[showmenu "ban player"]
-menuitem "Vote to remove bans"			"removebans"
-menuitem "Vote for autoteam"			[ showmenu "Auto Adjust Teams" ]
-menuitem "Vote to shuffle teams"		"shuffleteams"
+// menuitemtextinput "Server IP/DNS		"	"" "alias cc1" 
+// menuitemtextinput "Server port (optional)	"	"" "alias cc2"
+// menuitemtextinput "Server password (optional)	"	"" "alias cc3"
+menuitem "This menu is still being worked upon"
+// menuitem "		[ OK ]			" "connect $cc1 $cc2 $cc3"
+
+
+newmenu kick/ban
+
+menuitem "Kick a player"	[ showmenu "kick player" ]
+menuitem "Ban a player"		[ showmenu "ban player" ]
+menuitem "Remove all bans"	"removebans"
+
+newmenu "Team adjustment"
+
+menuitem "Force a team change"		[ showmenu "force team" ]
+menuitem "Initiate autoteam"		[ showmenu "Auto-adjust teams" ]
+menuitem "Initiate shuffleteams"	"shuffleteams"
 
 newmenu Gamemode
 
@@ -40,7 +65,7 @@ newmenu Mastermode
 menuitem "Unlock the server (open)"		"mastermode 0"
 menuitem "Lock the server (private)"		"mastermode 1"
 
-newmenu "Auto Adjust Teams"
+newmenu "Auto-adjust teams"
 
 menuitem "Turn auto-team on"	"autoteam 1"
 menuitem "Turn auto-team off"	"autoteam 0"
diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg
index 335c273f..61709c02 100644
--- a/config/resetbinds.cfg
+++ b/config/resetbinds.cfg
@@ -13,7 +13,7 @@ bind TAB "showscores"
 bind CLEAR ""
 bind RETURN ""
 bind PAUSE ""
-bind ESCAPE "showmenu main"
+bind ESCAPE [ if $connected [ showmenu "In-game" ] [ showmenu main ] ]
 bind SPACE "jump"
 bind EXCLAIM ""
 bind QUOTEDBL ""