* ingame menus redesigned

* spectators can now participate in non-team votes
* added teamvote "admitdefeat"
* replaced "nextmap" vote with "draw"
* removed vote "clientkick" vote (uses "kick" instead)
* removed teamvote "teamclientkick" (uses "kick" instead)
* renamed teamvote "teamkick" to teamvote "kick"
* added teamvote "denybuild" and "allowbuild"
* added vote "mute" and "unmute"
* added !denybuild and !allowbuild g_admin commands
* added /ignore and /unignore commands (and menu support)
* Game -> Info (formerly About) shows server settings instead of local ones
* Voting keys can now be configured in the Options menu
* Voting key binds now display with the vote status (F3 and F4 will be the
  eventual default binds for "teamvote yes" and "teamvote no" respectively)

1 files changed, 5 insertions, 25 deletions

diff --git a/ui/ingame.menu b/ui/ingame.menu
index a19d529d..13bd1f3c 100644
--- a/ui/ingame.menu
+++ b/ui/ingame.menu
@@ -53,8 +53,8 @@
 
     itemdef
     {
-      name about
-      text "About"  
+      name game 
+      text "Game"  
       rect 35 6 65 40
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
@@ -67,7 +67,7 @@
       action
       {
         play "sound/misc/menu1.wav"; 
-        open ingame_about
+        open ingame_game
       }
     }
 
@@ -93,32 +93,12 @@
 
     itemDef
     {
-      name vote
-      text "Vote"
-      type ITEM_TYPE_BUTTON
-      style WINDOW_STYLE_EMPTY
-      ownerdrawflag UI_SHOW_NOTSPECTATING
-      rect 170 6 50 40
-      textalign ITEM_ALIGN_CENTER
-      textalignx 25 
-      textaligny 28 
-      textscale .4
-      forecolor 1 1 1 1
-      visible 1 
-      action
-      {
-        play "sound/misc/menu1.wav"; 
-        open ingame_vote
-      }
-    }
-
-    itemDef
-    {
       name leave
       text "Exit"
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
-      rect 220 6 50 40 
+      //rect 220 6 50 40 
+      rect 170 6 50 40 
       textalign ITEM_ALIGN_CENTER
       textalignx 25 
       textaligny 28