* Removed the tremulous-manual and tremulous_ui directories since I merged them

  before

42 files changed, 0 insertions, 10314 deletions

diff --git a/tremulous_ui/connect.menu b/tremulous_ui/connect.menu
deleted file mode 100644
index 835326e9..00000000
--- a/tremulous_ui/connect.menu
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "Connect"

-    background "gfx/2d/load_screen"

-    rect 0 0 640 480

-    fullScreen MENU_FALSE

-    visible MENU_FALSE

-    style WINDOW_STYLE_SHADER

-  }

-}

diff --git a/tremulous_ui/createfavorite.menu b/tremulous_ui/createfavorite.menu
deleted file mode 100644
index 859e358d..00000000
--- a/tremulous_ui/createfavorite.menu
+++ /dev/null
@@ -1,129 +0,0 @@
-#include "ui/menudef.h"

-

-{

-\\ CREATE FAVORITE POPUP MENU \\

-

-  menuDef

-  {

-    name "createfavorite_popmenu"

-    visible 0

-    fullscreen 0

-    rect 204 122 235 235

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onESC

-    {

-      close createfavorite_popmenu;

-      open joinserver

-    }

-

-    itemDef

-    {

-      name window

-      rect 47 47 144 144

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    // ENTER NAME AND ADDRESS	//

-    

-    itemDef

-    {

-      name name

-      text "Name"

-      style 0

-      decoration

-      textscale .3

-      rect 0 61 110 20

-      textalign 1

-      textalignx 117

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-    }

-    

-    itemDef

-    {

-      name nameEntry

-      style 1

-      maxchars 15

-      text ""

-      textscale .25

-      TYPE 4

-      cvar "ui_favoriteName"

-      rect 60 81 120 20

-      textalign 0

-      textalignx 10

-      textaligny 16

-      forecolor 1 1 1 1

-      backcolor .2 .2 .2 .5

-      visible 1

-    }

-

-    itemDef

-    {

-      name address

-      text "IP Address"

-      style 0

-      decoration

-      textscale .3

-      rect 0 111 110 20

-      textalign 1

-      textalignx 117

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-    }

-    

-    itemDef

-    {

-      name addressEntry

-      style 1

-      maxchars 20

-      maxPaintChars 12

-      text ""

-      textscale .25

-      TYPE 4

-      maxchars 21

-      cvar "ui_favoriteAddress"

-      rect 60 131 120 20

-      textalign 0

-      textalignx 10

-      textaligny 16

-      forecolor 1 1 1 1

-      backcolor .2 .2 .2 .5

-      visible 1

-    }

-

-    itemDef

-    {

-      name yes

-      text "Ok"

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 103 158 30 26

-      textalign 1

-      textalignx 15

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1 

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav";

-        uiScript CreateFavorite;

-        close createfavorite_popmenu;

-        open joinserver

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/createserver.menu b/tremulous_ui/createserver.menu
deleted file mode 100644
index 170cd294..00000000
--- a/tremulous_ui/createserver.menu
+++ /dev/null
@@ -1,547 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ Server Creation \\

-

-  menuDef

-  {

-    name "createserver"

-    visible 0

-    fullscreen 1

-    rect 0 0 640 480

-    focusColor 1 .75 0 1

-    outOfBoundsClick  

-    style 0

-    

-    onOpen

-    {

-      uiScript loadArenas;

-      hide accept_alt;

-      show accept;

-      hide back_alt;

-      show back;

-      hide grpmessage

-    }

-    

-    onEsc

-    {

-      close createserver;

-      open joinserver

-    }

-    

-    itemDef

-    {

-      name background

-      rect 0 0 640 480

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      rect 2 2 330 418

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor 1 1 1 .25

-      forecolor 1 1 1 1

-      backcolor 0 0 0 .25

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      rect 334 2 302 418

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor 1 1 1 .25

-      forecolor 1 1 1 1

-      backcolor 0 0 0 .25

-      visible 1

-      decoration

-    }

-

-    // map selection

-

-    itemDef

-    {

-      name mappreview

-      style 0 

-      ownerdraw UI_STARTMAPCINEMATIC

-      rect 7 7 320 240

-      border 1

-      bordercolor .5 .5 .5 .5

-      visible 1 

-    }

-

-    itemDef

-    {

-      name mappreview

-      style WINDOW_STYLE_FILLED

-      rect 6 6 322 242

-      border 1

-      bordercolor .5 .5 .5 .5

-      visible 1

-    }

-

-    itemDef

-    {

-      name maplist

-      rect 6 252 322 164

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_ALLMAPS

-      textalign 3

-      textaligny 14

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      columns 1

-        2 190 25 ITEM_ALIGN_LEFT

-    }

-

-

-    //  SETTINGS  //

-

-    //  NORMAL  //  

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_EDITFIELD

-      text "Host Name:"

-      cvar "sv_hostname"

-      maxChars 32

-      maxPaintChars 20

-      rect 420 20 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-    

-    itemDef

-    {

-      name normal

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Time Limit:"

-      cvar "timelimit"

-      rect 420 40 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      maxchars 4

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Maximum Players:"

-      cvar "sv_maxclients"

-      rect 420 60 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      maxchars 4

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_YESNO

-      text "Require Password:"

-      cvar "g_needpassword"

-      rect 420 80 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type 4

-      text "Password:"

-      cvar "g_password"

-      rect 420 100 128 20

-      maxchars 10

-      maxPaintChars 10

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-

-

-

-

-

-

-    itemDef

-    {

-      name normal

-      group grpsettings

-      type ITEM_TYPE_MULTI

-      text "Punkbuster:"

-      cvar "sv_punkbuster"

-      cvarFloatList { "No" 0 "Yes" 1 }

-      rect 420 150 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-                                                          

-    itemDef

-    {

-      name normal

-      group grpsettings

-      type ITEM_TYPE_YESNO

-      text "Pure Server:"

-      cvar "sv_pure"

-      rect 420 170 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-    itemDef

-    {

-      name normal

-      group grpsettings

-      type ITEM_TYPE_MULTI

-      text "Dedicated:"

-      // dedicated is a special cvar in that as soon as it is set,

-      // the game goes to console only so the ui catches this one specifically

-      cvar "ui_dedicated"

-      cvarFloatList { "No" 0 "LAN" 1 "Internet" 2 }

-      rect 420 190 128 20 

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_YESNO

-      text "Auto Download:"

-      cvar "sv_allowdownload"

-      rect 420 210 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_YESNO

-      text "Enable Voting:"

-      cvar "g_allowvote"

-      rect 420 230 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-

-

-

-

-

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Minimum Ping:"

-      cvar "sv_minping"

-      rect 420 280 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      maxchars 4

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Maximum Ping:"

-      cvar "sv_maxping"

-      rect 420 300 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      maxchars 4

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_YESNO

-      text "Synchronous Client:"

-      cvar "g_synchronousclients"

-      rect 420 320 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Max Rate:"

-      cvar "sv_maxrate"

-      rect 420 340 128 20 

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      maxchars 4

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Zombie Time:"

-      cvar "sv_zombietime"

-      rect 420 360 128 20

-      maxchars 4

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-

-    itemDef

-    {

-      name expert

-      group grpsettings

-      type ITEM_TYPE_NUMERICFIELD

-      text "Reconnect Limit:"

-      cvar "sv_reconnectlimit"

-      maxchars 4

-      rect 420 380 128 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 65

-      textaligny 12

-      textscale .36        

-      forecolor 1 1 1 1

-      visible 1  

-    }

-    

-

-

-

-

-

-    // BACK BAR //

-

-    itemDef

-    {

-      name back

-      style 3

-      background "ui/assets/backarrow.tga"

-      rect 16 424 50 50 

-      visible 1 

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close createserver;

-        open joinserver

-      }

-      

-      mouseEnter

-      {

-        hide back;

-        show back_alt

-      }

-    }

-

-    itemDef

-    {

-      name back_alt

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/backarrow_alt.tga"

-      rect 16 424 50 50

-      backcolor 0 0 0 0

-      forecolor 1 1 1 1

-      visible 0

-      type ITEM_TYPE_BUTTON

-      

-      text "Back"

-      textalign ITEM_ALIGN_LEFT

-      textaligny 36

-      textalignx 60

-      textscale .6

-      

-      mouseExit

-      {

-        hide back_alt;

-        show back

-      }

-      

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close createserver;

-        open joinserver

-      }   

-    }

-

-

-

-

-    itemDef

-    {

-      name accept

-      style 3 

-      rect 574 424 50 50 

-      background "ui/assets/forwardarrow.tga"

-      backcolor 0 0 0 0

-      forecolor 1 1 1 1

-      visible 1 

-      mouseEnter

-      {

-        hide accept;

-        show accept_alt

-      }

-      

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close fight; //TA: no i don't know

-        uiScript StartServer

-      }

-    }

-

-    itemDef

-    {

-      name accept_alt

-      style WINDOW_STYLE_SHADER

-      rect 574 424 50 50

-      background "ui/assets/forwardarrow_alt.tga"

-      backcolor 0 0 0 0

-      type ITEM_TYPE_BUTTON

-      forecolor 1 1 1 1

-      visible 0  

-      type ITEM_TYPE_BUTTON 

-      

-      text "Create"

-      textalign ITEM_ALIGN_LEFT

-      textaligny 36

-      textalignx -70

-      textscale .6

-      

-      mouseExit

-      {

-        hide accept_alt;

-        show accept

-      }

-      

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close fight; //TA: no i don't know

-        uiScript StartServer

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/error.menu b/tremulous_ui/error.menu
deleted file mode 100644
index 3674a91e..00000000
--- a/tremulous_ui/error.menu
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ ERROR \\

-

-  menuDef

-  {

-    name "error_popmenu"

-    visible 0

-    fullscreen 0

-    rect 158 80 320 320

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onClose { uiScript clearError }

-    onOpen { }

-    onESC

-    {

-      play "sound/misc/menu1.wav"; 

-      close error_popmenu;

-      open main

-    }

-

-

-    itemDef

-    {

-      name window

-      rect 10 15 300 320

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name errorinfo

-      rect 0 50 320 20	

-      text "Error:"

-      textalign 1

-      textstyle 6

-      textscale .333

-      textalignx 160

-      textaligny 23

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-    

-    itemDef

-    {

-      name errorinfo

-      rect 60 80 200 270

-      type ITEM_TYPE_TEXT

-      style 1

-      textstyle 3

-      autowrapped

-      cvar "com_errorMessage"

-      textalign ITEM_ALIGN_CENTER

-      textalignx 100

-      textaligny 23

-      textscale .25

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-   

-

-    //	BUTTON	//

-

-

-    itemDef

-    {

-      name exit

-      text "Exit"

-      type 1

-      textscale .25

-      group grpControlbutton

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 138 295 45 26

-      textalign 1

-      textalignx 22

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close error_popmenu;

-        open main

-      }

-    }

-  }

-}

-

-

diff --git a/tremulous_ui/findplayer.menu b/tremulous_ui/findplayer.menu
deleted file mode 100644
index df25f02c..00000000
--- a/tremulous_ui/findplayer.menu
+++ /dev/null
@@ -1,245 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ FIND PLAYER POPUP MENU \\

-

-  menuDef

-  {

-    name "findplayer_popmenu"

-    visible 0

-    fullscreen 0

-    rect 158 80 320 340

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onClose { }

-    onOpen

-    {

-      uiScript FindPlayer;

-      setfocus namefield

-    }

-    

-    onESC

-    {

-      close findplayer_popmenu;

-      open joinserver

-    }

-    

-    itemDef

-    {

-      name window

-      rect 10 15 320 340

-      style 1

-      backcolor 0 0 0 .25

-      forecolor 0 0 0 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      rect 10 15 300 320

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-       

-    itemDef

-    {

-      name findplayer

-      rect 0 20 320 20	

-      text "Find a Friend" 

-      textalign 1

-      textstyle 3

-      textscale .333

-      textalignx 155

-      textaligny 23

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-    

-    itemDef

-    {

-      name window

-      rect 55 53 245 20

-      style WINDOW_STYLE_FILLED

-      backcolor .2 .2 .2 .5

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name namefield

-      group "playersettinggroup"

-      type ITEM_TYPE_EDITFIELD

-      style 0

-      text "Name:"

-      cvar "ui_findplayer"

-      maxChars 20

-      rect 20 48 215 32 

-      textalign ITEM_ALIGN_LEFT		

-      textalignx 5

-      textaligny 21 

-      textscale .3        

-      outlinecolor .2 .2 .2 .5

-      backcolor 0 0 0 0

-      forecolor 1 1 1 1

-      border 0

-      bordercolor 0 0 0 0

-      action { ui_script FindPlayer }

-      visible 1 

-    }

-

-

-    itemDef

-    {

-      name serverNameList		//LIST OF SERVER NAMES//

-      rect 20 75 280 80

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_FILLED

-      elementwidth 120

-      elementheight 16

-      textscale .225

-      backcolor 0 0 0 1

-      outlinecolor .2 .2 .2 .5

-      border 1

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_FINDPLAYER

-      visible 1

-    }

-

-    itemDef

-    {

-      name serverNamewindow 

-      rect 20 75 264 80

-      style 1

-      backcolor 0 0 0 0

-      forecolor 0 0 0 0

-      border 1

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name serverInfoList		//LIST OF SERVER STATUS INFORMATION//

-      rect 20 175 280 110

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_FILLED

-      elementwidth 120

-      elementheight 16

-      textscale .225

-      backcolor 0 0 0 1

-      border 1

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_SERVERSTATUS

-      notselectable

-      visible 1

-      columns 4

-        2   40  20   ITEM_ALIGN_LEFT

-        40  40  10   ITEM_ALIGN_LEFT

-        90  40  10   ITEM_ALIGN_LEFT

-        135 40  20   ITEM_ALIGN_LEFT

-    }

-

-    itemDef

-    {

-      name serverInfowindow 

-      rect 20 175 264 110

-      style 1

-      backcolor 0 0 0 0

-      forecolor 0 0 0 0

-      border 1

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-

-    //	BUTTON	//

-

-    itemDef

-    {

-      name exit

-      text "Exit"

-      type 1

-      textscale .25

-      group grpControlbutton

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 38 295 45 26

-      textalign 1

-      textalignx 22

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav";

-        close findplayer_popmenu;

-        open joinserver

-      }

-    }

-    

-    itemDef

-    {

-      name search

-      text "Search"

-      type 1

-      textscale .25

-      group grpControlbutton

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 131 295 60 26

-      textalign 1

-      textalignx 30

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav";

-        ui_script FindPlayer

-      }

-    }

-    

-    itemDef

-    {

-      name join

-      text "Join"

-      type 1

-      textscale .25

-      group grpControlbutton

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 238 295 45 26

-      textalign 1

-      textalignx 22

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1

-      visible 1

-      action { ui_script FoundPlayerJoinServer }

-    }

-  }

-}

-

-

diff --git a/tremulous_ui/hud.txt b/tremulous_ui/hud.txt
deleted file mode 100644
index c99bead1..00000000
--- a/tremulous_ui/hud.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// hud menu defs

-// 

-{

-  loadMenu { "ui/tremulous_human_hud.menu" }

-  loadMenu { "ui/tremulous_alien_builder_hud.menu" }

-  loadMenu { "ui/tremulous_alien_general_hud.menu" }

-  loadMenu { "ui/tremulous_default_hud.menu" }

-  

-  loadMenu { "ui/teamscore.menu" }

-  loadMenu { "ui/loading.menu" }

-}

diff --git a/tremulous_ui/infopanes.def b/tremulous_ui/infopanes.def
deleted file mode 100644
index fb99e245..00000000
--- a/tremulous_ui/infopanes.def
+++ /dev/null
@@ -1,350 +0,0 @@
-{
-  name alienteam
-  text "The Alien Team\n\n"
-  text "The Aliens' strengths are in movement "
-  text "and the ability to quickly construct new bases quickly. They possess a "
-  text "range of abilities including basic melee attacks, movement-"
-  text "crippling poisons and more."
-  align left
-}
-{
-  name humanteam
-  text "The Human Team\n\n"
-  text "The humans are the masters of technology. Although their bases take "
-  text "long to construct, their automated defense ensures they stay built. "
-  text "A wide range of upgrades and weapons are available to the humans, each "
-  text "contributing to eradicate the alien threat."
-  align left
-}
-{
-  name spectateteam
-  text "Watch the game without playing."
-}
-{
-  name autoteam
-  text "Join the team with the least players."
-}
-{
-  name rifleitem
-  text "Rifle\n\n"
-  text "Basic weapon. Cased projectile weapon, with a slow clip based "
-  text "reload system.\n\n"
-  text "Credits: Free"
-}
-{
-  name ckititem
-  text "Construction kit\n\n"
-  text "Used for building all basic structures. This includes "
-  text "spawns, power and basic defense.\n\n"
-  text "Credits: Free"
-}
-{
-  name ackititem
-  text "Advanced Construction kit\n\n"
-  text "Used for building advanced structures. This includes "
-  text "combat computers and advanced defense.\n\n"
-  text "Credits: Free"
-}
-{
-  name shotgunitem
-  text "Shotgun\n\n"
-  text "Close range weapon that is useful against larger foes. "
-  text "It has a slow repeat rate, but can be devastatingly "
-  text "effective.\n\n"
-  text "Credits: " text 150
-}
-{
-  name chaingunitem
-  text "Chain Gun\n\n"
-  text "Belt drive, cased projectile weapon. It has a high "
-  text "repeat rate but a wide firing angle and is therefore relatively "
-  text "inaccurate.\n\n"
-  text "Credits: " text 400
-}
-{
-  name flameritem
-  text "Flamethrower\n\n"
-  text "Sprays fire at its target. It is powered by compressed "
-  text "gas. The relatively low rate of fire means this weapon is most "
-  text "effective against static targets.\n\n"
-  text "Credits: " text 450
-}
-{
-  name mdriveritem
-  text "Mass Driver\n\n"
-  text "A portable particle accelerator which causes minor "
-  text "nuclear reactions at the point of impact. It has a very large "
-  text "payload, but fires slowly.\n\n"
-  text "Credits: " text 350
-}
-{
-  name prifleitem
-  text "Pulse Rifle\n\n"
-  text "An energy weapon that fires pulses of concentrated energy at a fast "
-  text "rate. It requires re-energising every 50 pulses.\n\n"
-  text "Credits: " text 400
-}
-{
-  name lcannonitem
-  text "Lucifer Cannon\n\n"
-  text "Similar to the pulse rifle, but more powerful. "
-  text "Additionally, it has a secondary attack where energy can be charged "
-  text "up to shoot a devastating ball of energy.\n\n"
-  text "Credits: " text 600
-}
-{
-  name lgunitem
-  text "Las Gun\n\n"
-  text "Slightly more powerful than the basic rifle, but "
-  text "instead of bullets it fires small packets of energy.\n\n"
-  text "Credits: " text 250
-}
-{
-  name psawitem
-  text "Pain Saw\n\n"
-  text "Similar to a chainsaw, but instead of a chain "
-  text "it has an electric arc capable of dealing a great deal of damage at "
-  text "close range.\n\n"
-  text "Credits: " text 100
-}
-{
-  name grenitem
-  text "Grenade\n\n"
-  text "A small incendinary device ideal for damaging tightly packed "
-  text "alien structures. Has a five second timer.\n\n"
-  text "Credits: " text 200
-}
-{
-  name larmouritem
-  text "Light Armour\n\n"
-  text "Protective armour that helps to defend against light alien melee "
-  text "attacks.\n\n"
-  text "Credits: " text 70
-}
-{
-  name helmetitem
-  text "Helmet\n\n"
-  text "In addition to protecting your head, the helmet provides a "
-  text "scanner indicating the presence of any non-human lifeforms in your "
-  text "immediate vicinity.\n\n"
-  text "Credits: " text 90
-}
-{
-  name battpackitem
-  text "Battery Pack\n\n"
-  text "Back-mounted battery pack that permits storage of one and a half "
-  text "times the normal energy capacity for energy weapons.\n\n"
-  text "Credits: " text 100
-}
-{
-  name jetpackitem
-  text "Jet Pack\n\n"
-  text "Back-mounted jet pack that enables the user to fly to remote "
-  text "locations. It is very useful against alien spawns in hard to reach "
-  text "spots.\n\n"
-  text "Credits: " text 120
-}
-{
-  name bsuititem
-  text "Battle Suit\n\n"
-  text "A full body armour that is highly effective at repelling alien attacks. "
-  text "It allows the user to enter hostile situations with a greater degree "
-  text "of confidence.\n\n"
-  text "Credits: " text 400
-}
-{
-  name ammoitem
-  text "Ammunition\n\n"
-  text "Ammunition for the currently held weapon.\n\n"
-  text "Credits: Free"
-}
-{
-  name telenodebuild
-  text "Telenode\n\n"
-  text "The most basic human structure. It provides a means for "
-  text "humans to enter the battle arena. Without any of these the humans "
-  text "cannot spawn and defeat is imminent.\n\n"
-  text "Power: " text 10
-}
-{
-  name mgturretbuild
-  text "Machine Gun Turret\n\n"
-  text "Automated base defense that is effective against fast moving targets, but "
-  text "does not cause much damage on its own and should "
-  text "always be backed up by physical support.\n\n"
-  text "Power: " text 8
-}
-{
-  name armbuild
-  text "Armoury\n\n"
-  text "An essential part of the human base, providing a means "
-  text "to upgrade the basic human. A range of upgrades and weapons are "
-  text "available from the armoury, each with a price.\n\n"
-  text "Power: " text 10
-}
-{
-  name medistatbuild
-  text "Medistation\n\n"
-  text "A structure providing an automated healing energy that restores "
-  text "the health of any human that stands inside it. It may only be used "
-  text "by one person at a time.\n\n"
-  text "Power: " text 8
-}
-{
-  name reactorbuild
-  text "Reactor\n\n"
-  text "All structures except the telenode rely on a reactor to operate."
-  text "The reactor provides power for all the human structures either "
-  text "directly or via repeaters. There can only be a single reactor.\n\n"
-}
-{
-  name dccbuild
-  text "Defense Computer\n\n"
-  text "A structure coordinating the action of base defense so that "
-  text "defense is distributed evenly among the enemy. "
-  text "This structure is required for building the Tesla Generator.\n\n"
-  text "Power: " text 8
-}
-{
-  name teslabuild
-  text "Tesla Generator\n\n"
-  text "A structure equipped with a strong electrical attack that always "
-  text "hits its target. It is useful against larger aliens "
-  text "and for consolidating basic defense.\n\n"
-  text "Power: " text 10
-}
-{
-  name repeaterbuild
-  text "Repeater\n\n"
-  text "A power distributor that transmits power from the reactor "
-  text "to remote locations, so that bases may be built far from the reactor.\n\n"
-}
-{
-  name eggpodbuild
-  text "Egg\n\n"
-  text "The most basic alien structure. It allows aliens to spawn "
-  text "and protect the Overmind. Without any of these, the Overmind is left "
-  text "nearly defenseless and defeat is imminent.\n\n"
-  text "Sentience: " text 10
-}
-{
-  name overmindbuild
-  text "Overmind\n\n"
-  text "A collective consciousness that controls all the "
-  text "alien structures in its vicinity. It must be protected at all costs, "
-  text "since its death will render alien structures defenseless."
-}
-{
-  name barricadebuild
-  text "Barricade\n\n"
-  text "Used to obstruct corridors and doorways, "
-  text "hindering humans from threatening the spawns and Overmind.\n\n"
-  text "Sentience: " text 10
-}
-{
-  name acid_tubebuild
-  text "Acid Tube\n\n"
-  text "Ejects lethal poisonous "
-  text "acid at an approaching human. These are highly effective when used in "
-  text "conjunction with a trapper to hold the victim in place.\n\n"
-  text "Sentience: " text 8
-}
-{
-  name hivebuild
-  text "Hive\n\n"
-  text "Houses millions of tiny "
-  text "insectoid aliens. When a human approaches this structure, the "
-  text "insectoids attack.\n\n"
-  text "Sentience: " text 12
-}
-{
-  name trapperbuild
-  text "Trapper\n\n"
-  text "Fires a blob of adhesive spit at any non-alien in its "
-  text "line of sight. This hinders their movement, making them an easy target "
-  text "for other defensive structures or aliens.\n\n"
-  text "Sentience: " text 10
-}
-{
-  name boosterbuild
-  text "Booster\n\n"
-  text "Provides any alien with a poison ability on all its "
-  text "attacks. In addition to the default attack damage, the victim loses "
-  text "health over time unless they heal themselves with anti-toxin."
-  text "The booster also increases the rate of health regeneration for "
-  text "any nearby aliens.\n\n"
-  text "Sentience: " text 12
-}
-{
-  name hovelbuild
-  text "Hovel\n\n"
-  text "An armoured shell used by the builder class to "
-  text "hide in, if the alien base is under attack. It may be entered or "
-  text "left at any time.\n\n"
-  text "Sentience: " text 8
-}
-{
-  name builderclass
-  text "Granger\n\n"
-  text "Responsible for building and maintaining all "
-  text "the alien structures."
-}
-{
-  name builderupgclass
-  text "Advanced Granger\n\n"
-  text "Similar to the base Granger, "
-  text "except that in addition to being able to build structures it has a "
-  text "melee attack and the ability to crawl on walls."
-}
-{
-  name level0class
-  text "Dretch\n\n"
-  text "Has a lethal bite and the ability to crawl "
-  text "on walls and ceilings."
-}
-{
-  name level1class
-  text "Basilisk\n\n"
-  text "Able to crawl on walls and ceilings. "
-  text "Its melee attack is most effective when combined with the ability to "
-  text "grab its foe."
-}
-{
-  name level1upgclass
-  text "Advanced Basilisk\n\n"
-  text "In addition to the basic Basilisk abilities, the Advanced "
-  text "Basilisk sprays a poisonous gas which disorientaits any "
-  text "nearby humans."
-}
-{
-  name level2class
-  text "Marauder\n\n"
-  text "Has a melee attack and the ability to jump off walls."
-  text "This allows the Marauder to gather great speed in enclosed areas."
-}
-{
-  name level2upgclass
-  text "Advanced Marauder\n\n"
-  text "The Advanced Marauder has all the abilities of the base Marauder "
-  text "including an area effect electric shock attack."
-}
-{
-  name level3class
-  text "Dragoon\n\n"
-  text "Possesses a melee attack and the pounce ability, which may "
-  text "be used as an attack, or a means to reach a remote location inaccessible "
-  text "from the ground."
-}
-{
-  name level3upgclass
-  text "Advanced Dragoon\n\n"
-  text "In addition to the basic Dragoon abilities, the Dragoon Upgrade has "
-  text "3 barbs which may be used to attack humans from a distance."
-}
-{
-  name level4class
-  text "Tyrant\n\n"
-  text "Provides a healing aura in which nearby aliens regenerate health "
-  text "faster than usual. As well as a melee attack, this class can charge "
-  text "at enemy humans and structures, inflicting great damage."
-}
diff --git a/tremulous_ui/infopanes.def.h b/tremulous_ui/infopanes.def.h
deleted file mode 100644
index 37a259b1..00000000
--- a/tremulous_ui/infopanes.def.h
+++ /dev/null
@@ -1,418 +0,0 @@
-#include "/home/tma/tremulous/src/game/tremulous.h"
-
-#define CREDITS(X) text "Credits: " text X
-#define HUMAN_BCOST(X) text "Power: " text X
-#define ALIEN_BCOST(X) text "Sentience: " text X
-
-//team menu
-
-{
-  name alienteam
-  text "The Alien Team\n\n"
-  text "The Aliens' strengths are in movement "
-  text "and the ability to quickly construct new bases quickly. They possess a "
-  text "range of abilities including basic melee attacks, movement-"
-  text "crippling poisons and more."
-  align left
-}
-
-{
-  name humanteam
-  text "The Human Team\n\n"
-  text "The humans are the masters of technology. Although their bases take "
-  text "long to construct, their automated defense ensures they stay built. "
-  text "A wide range of upgrades and weapons are available to the humans, each "
-  text "contributing to eradicate the alien threat."
-  align left
-}
-
-{
-  name spectateteam
-  text "Watch the game without playing."
-}
-
-{
-  name autoteam
-  text "Join the team with the least players."
-}
-
-
-//human items
-
-{
-  name rifleitem
-  text "Rifle\n\n"
-  text "Basic weapon. Cased projectile weapon, with a slow clip based "
-  text "reload system.\n\n"
-  text "Credits: Free"
-}
-
-{
-  name ckititem
-  text "Construction kit\n\n"
-  text "Used for building all basic structures. This includes "
-  text "spawns, power and basic defense.\n\n"
-  text "Credits: Free"
-}
-
-{
-  name ackititem
-  text "Advanced Construction kit\n\n"
-  text "Used for building advanced structures. This includes "
-  text "combat computers and advanced defense.\n\n"
-  text "Credits: Free"
-}
-
-{
-  name shotgunitem
-  text "Shotgun\n\n"
-  text "Close range weapon that is useful against larger foes. "
-  text "It has a slow repeat rate, but can be devastatingly "
-  text "effective.\n\n"
-  CREDITS( SHOTGUN_PRICE )
-}
-
-{
-  name chaingunitem
-  text "Chain Gun\n\n"
-  text "Belt drive, cased projectile weapon. It has a high "
-  text "repeat rate but a wide firing angle and is therefore relatively "
-  text "inaccurate.\n\n"
-  CREDITS( CHAINGUN_PRICE )
-}
-
-{
-  name flameritem
-  text "Flamethrower\n\n"
-  text "Sprays fire at its target. It is powered by compressed "
-  text "gas. The relatively low rate of fire means this weapon is most "
-  text "effective against static targets.\n\n"
-  CREDITS( FLAMER_PRICE )
-}
-
-{
-  name mdriveritem
-  text "Mass Driver\n\n"
-  text "A portable particle accelerator which causes minor "
-  text "nuclear reactions at the point of impact. It has a very large "
-  text "payload, but fires slowly.\n\n"
-  CREDITS( MDRIVER_PRICE )
-}
-
-{
-  name prifleitem
-  text "Pulse Rifle\n\n"
-  text "An energy weapon that fires pulses of concentrated energy at a fast "
-  text "rate. It requires re-energising every 50 pulses.\n\n"
-  CREDITS( PRIFLE_PRICE )
-}
-
-{
-  name lcannonitem
-  text "Lucifer Cannon\n\n"
-  text "Similar to the pulse rifle, but more powerful. "
-  text "Additionally, it has a secondary attack where energy can be charged "
-  text "up to shoot a devastating ball of energy.\n\n"
-  CREDITS( LCANNON_PRICE )
-}
-
-{
-  name lgunitem
-  text "Las Gun\n\n"
-  text "Slightly more powerful than the basic rifle, but "
-  text "instead of bullets it fires small packets of energy.\n\n"
-  CREDITS( LASGUN_PRICE )
-}
-
-{
-  name psawitem
-  text "Pain Saw\n\n"
-  text "Similar to a chainsaw, but instead of a chain "
-  text "it has an electric arc capable of dealing a great deal of damage at "
-  text "close range.\n\n"
-  CREDITS( PAINSAW_PRICE )
-}
-
-{
-  name grenitem
-  text "Grenade\n\n"
-  text "A small incendinary device ideal for damaging tightly packed "
-  text "alien structures. Has a five second timer.\n\n"
-  CREDITS( GRENADE_PRICE )
-}
-
-{
-  name larmouritem
-  text "Light Armour\n\n"
-  text "Protective armour that helps to defend against light alien melee "
-  text "attacks.\n\n"
-  CREDITS( LIGHTARMOUR_PRICE )
-}
-
-{
-  name helmetitem
-  text "Helmet\n\n"
-  text "In addition to protecting your head, the helmet provides a "
-  text "scanner indicating the presence of any non-human lifeforms in your "
-  text "immediate vicinity.\n\n"
-  CREDITS( HELMET_PRICE )
-}
-
-{
-  name battpackitem
-  text "Battery Pack\n\n"
-  text "Back-mounted battery pack that permits storage of one and a half "
-  text "times the normal energy capacity for energy weapons.\n\n"
-  CREDITS( BATTPACK_PRICE )
-}
-
-{
-  name jetpackitem
-  text "Jet Pack\n\n"
-  text "Back-mounted jet pack that enables the user to fly to remote "
-  text "locations. It is very useful against alien spawns in hard to reach "
-  text "spots.\n\n"
-  CREDITS( JETPACK_PRICE )
-}
-
-{
-  name bsuititem
-  text "Battle Suit\n\n"
-  text "A full body armour that is highly effective at repelling alien attacks. "
-  text "It allows the user to enter hostile situations with a greater degree "
-  text "of confidence.\n\n"
-  CREDITS( BSUIT_PRICE )
-}
-
-{
-  name ammoitem
-  text "Ammunition\n\n"
-  text "Ammunition for the currently held weapon.\n\n"
-  text "Credits: Free"
-}
-
-
-//human structures
-
-{
-  name telenodebuild
-  text "Telenode\n\n"
-  text "The most basic human structure. It provides a means for "
-  text "humans to enter the battle arena. Without any of these the humans "
-  text "cannot spawn and defeat is imminent.\n\n"
-  HUMAN_BCOST( HSPAWN_BP )
-}
-
-{
-  name mgturretbuild
-  text "Machine Gun Turret\n\n"
-  text "Automated base defense that is effective against fast moving targets, but "
-  text "does not cause much damage on its own and should "
-  text "always be backed up by physical support.\n\n"
-  HUMAN_BCOST( MGTURRET_BP )
-}
-
-{
-  name armbuild
-  text "Armoury\n\n"
-  text "An essential part of the human base, providing a means "
-  text "to upgrade the basic human. A range of upgrades and weapons are "
-  text "available from the armoury, each with a price.\n\n"
-  HUMAN_BCOST( ARMOURY_BP )
-}
-
-{
-  name medistatbuild
-  text "Medistation\n\n"
-  text "A structure providing an automated healing energy that restores "
-  text "the health of any human that stands inside it. It may only be used "
-  text "by one person at a time.\n\n"
-  HUMAN_BCOST( MEDISTAT_BP )
-}
-
-{
-  name reactorbuild
-  text "Reactor\n\n"
-  text "All structures except the telenode rely on a reactor to operate."
-  text "The reactor provides power for all the human structures either "
-  text "directly or via repeaters. There can only be a single reactor.\n\n"
-}
-
-{
-  name dccbuild
-  text "Defense Computer\n\n"
-  text "A structure coordinating the action of base defense so that "
-  text "defense is distributed evenly among the enemy. "
-  text "This structure is required for building the Tesla Generator.\n\n"
-  HUMAN_BCOST( DC_BP )
-}
-
-{
-  name teslabuild
-  text "Tesla Generator\n\n"
-  text "A structure equipped with a strong electrical attack that always "
-  text "hits its target. It is useful against larger aliens "
-  text "and for consolidating basic defense.\n\n"
-  HUMAN_BCOST( TESLAGEN_BP )
-}
-
-{
-  name repeaterbuild
-  text "Repeater\n\n"
-  text "A power distributor that transmits power from the reactor "
-  text "to remote locations, so that bases may be built far from the reactor.\n\n"
-}
-
-//alien structures
-
-{
-  name eggpodbuild
-  text "Egg\n\n"
-  text "The most basic alien structure. It allows aliens to spawn "
-  text "and protect the Overmind. Without any of these, the Overmind is left "
-  text "nearly defenseless and defeat is imminent.\n\n"
-  ALIEN_BCOST( ASPAWN_BP )
-}
-
-{
-  name overmindbuild
-  text "Overmind\n\n"
-  text "A collective consciousness that controls all the "
-  text "alien structures in its vicinity. It must be protected at all costs, "
-  text "since its death will render alien structures defenseless."
-}
-
-{
-  name barricadebuild
-  text "Barricade\n\n"
-  text "Used to obstruct corridors and doorways, "
-  text "hindering humans from threatening the spawns and Overmind.\n\n"
-  ALIEN_BCOST( BARRICADE_BP )
-}
-
-{
-  name acid_tubebuild
-  text "Acid Tube\n\n"
-  text "Ejects lethal poisonous "
-  text "acid at an approaching human. These are highly effective when used in "
-  text "conjunction with a trapper to hold the victim in place.\n\n"
-  ALIEN_BCOST( ACIDTUBE_BP )
-}
-
-{
-  name hivebuild
-  text "Hive\n\n"
-  text "Houses millions of tiny "
-  text "insectoid aliens. When a human approaches this structure, the "
-  text "insectoids attack.\n\n"
-  ALIEN_BCOST( HIVE_BP )
-}
-
-{
-  name trapperbuild
-  text "Trapper\n\n"
-  text "Fires a blob of adhesive spit at any non-alien in its "
-  text "line of sight. This hinders their movement, making them an easy target "
-  text "for other defensive structures or aliens.\n\n"
-  ALIEN_BCOST( TRAPPER_BP )
-}
-
-{
-  name boosterbuild
-  text "Booster\n\n"
-  text "Provides any alien with a poison ability on all its "
-  text "attacks. In addition to the default attack damage, the victim loses "
-  text "health over time unless they heal themselves with anti-toxin."
-  text "The booster also increases the rate of health regeneration for "
-  text "any nearby aliens.\n\n"
-  ALIEN_BCOST( BOOSTER_BP )
-}
-
-{
-  name hovelbuild
-  text "Hovel\n\n"
-  text "An armoured shell used by the builder class to "
-  text "hide in, if the alien base is under attack. It may be entered or "
-  text "left at any time.\n\n"
-  ALIEN_BCOST( HOVEL_BP )
-}
-
-//alien classes
-
-{
-  name builderclass
-  text "Granger\n\n"
-  text "Responsible for building and maintaining all "
-  text "the alien structures."
-}
-
-{
-  name builderupgclass
-  text "Advanced Granger\n\n"
-  text "Similar to the base Granger, "
-  text "except that in addition to being able to build structures it has a "
-  text "melee attack and the ability to crawl on walls."
-}
-
-{
-  name level0class
-  text "Dretch\n\n"
-  text "Has a lethal bite and the ability to crawl "
-  text "on walls and ceilings."
-}
-
-{
-  name level1class
-  text "Basilisk\n\n"
-  text "Able to crawl on walls and ceilings. "
-  text "Its melee attack is most effective when combined with the ability to "
-  text "grab its foe."
-}
-
-{
-  name level1upgclass
-  text "Advanced Basilisk\n\n"
-  text "In addition to the basic Basilisk abilities, the Advanced "
-  text "Basilisk sprays a poisonous gas which disorientaits any "
-  text "nearby humans."
-}
-
-{
-  name level2class
-  text "Marauder\n\n"
-  text "Has a melee attack and the ability to jump off walls."
-  text "This allows the Marauder to gather great speed in enclosed areas."
-}
-
-{
-  name level2upgclass
-  text "Advanced Marauder\n\n"
-  text "The Advanced Marauder has all the abilities of the base Marauder "
-  text "including an area effect electric shock attack."
-}
-
-{
-  name level3class
-  text "Dragoon\n\n"
-  text "Possesses a melee attack and the pounce ability, which may "
-  text "be used as an attack, or a means to reach a remote location inaccessible "
-  text "from the ground."
-}
-
-{
-  name level3upgclass
-  text "Advanced Dragoon\n\n"
-  text "In addition to the basic Dragoon abilities, the Dragoon Upgrade has "
-  text "3 barbs which may be used to attack humans from a distance."
-}
-
-{
-  name level4class
-  text "Tyrant\n\n"
-  text "Provides a healing aura in which nearby aliens regenerate health "
-  text "faster than usual. As well as a melee attack, this class can charge "
-  text "at enemy humans and structures, inflicting great damage."
-}
-
-// graphic <top|bottom|left|right> <center|some numerical offset> <shadername> <width> <height>
-// graphic left center "gfx/blah" 64 128
diff --git a/tremulous_ui/ingame.menu b/tremulous_ui/ingame.menu
deleted file mode 100644
index ae4833fd..00000000
--- a/tremulous_ui/ingame.menu
+++ /dev/null
@@ -1,135 +0,0 @@
-#include "ui/menudef.h"

-{

-  assetGlobalDef

-  {

-    font "fonts/font" 26        // font

-    smallFont "fonts/smallfont" 20        // font

-    bigFont "fonts/bigfont" 34        // font

-    cursor "ui/assets/3_cursor3"      // cursor 

-    gradientBar "ui/assets/gradientbar2.tga"  // gradient bar

-    itemFocusSound "sound/misc/menu2.wav"   // sound for item getting focus (via keyboard or mouse )

-  

-    fadeClamp 1.0         // sets the fadeup alpha

-    fadeCycle 1         // how often fade happens in milliseconds

-    fadeAmount 0.1          // amount to adjust alpha per cycle

-

-    shadowColor 0.1 0.1 0.1 0.25      // shadow color

-  }

-                 

-

-  \\ INGAME MENU \\

-

-  menuDef 

-  {

-    name "ingame"

-    style WINDOW_STYLE_FILLED

-    visible 0

-    fullScreen 0

-    outOfBoundsClick      // this closes the window if it gets a click out of the rectangle

-    rect 0 0 640 48 

-    focusColor 1 .75 0 1

-    disableColor .5 .5 .5 1

-    backColor 0 0 0 1

-

-    onEsc

-    {

-      close ingame;

-    }

-    

-    itemDef

-    {

-      name splashmodel

-      rect 0 -10 640 66 

-      type ITEM_TYPE_MODEL

-      style WINDOW_STYLE_FILLED

-      asset_model "models/splash/splash_screen.md3"

-      model_fovx 32.0

-      model_fovy 3.8

-      model_angle 180

-      visible 1

-      decoration

-      backcolor 0 0 0 1

-    }

-

-    itemdef

-    {

-      name about

-      text "About"  

-      rect 35 6 65 40

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      textalign ITEM_ALIGN_CENTER

-      textalignx 32 

-      textaligny 28 

-      textscale .4

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        open ingame_about

-      }

-    }

-

-    itemDef

-    {

-      name options

-      text "Options"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 100 6 70 40

-      textalign ITEM_ALIGN_CENTER

-      textalignx 35 

-      textaligny 28 

-      textscale .4

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        open ingame_options

-      }

-    }

-

-    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 

-      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_leave

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/ingame.txt b/tremulous_ui/ingame.txt
deleted file mode 100644
index fd2a77f9..00000000
--- a/tremulous_ui/ingame.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// menu defs

-// 

-{ 

-  loadMenu { "ui/ingame.menu" }

-  loadMenu { "ui/ingame_about.menu" }

-  loadMenu { "ui/ingame_options.menu" }

-  loadMenu { "ui/ingame_vote.menu" }

-  loadMenu { "ui/ingame_callvote.menu" }

-  loadMenu { "ui/ingame_callteamvote.menu" }

-  loadMenu { "ui/ingame_leave.menu" }

-}

diff --git a/tremulous_ui/ingame_about.menu b/tremulous_ui/ingame_about.menu
deleted file mode 100644
index b90cf480..00000000
--- a/tremulous_ui/ingame_about.menu
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ INGAME ABOUT BOX \\

-

-  menuDef

-  {

-    name "ingame_about"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick			// this closes the window if it gets a click out of the rectangle

-    rect 10 56 256 160

-    focusColor 1 .75 0 1

-

-    itemDef

-    {

-      name window

-      rect 10 5 256 150

-      style 1

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 25 256 20

-      name gametypefield

-      type 4

-      style 0	

-      text "Map Name:"

-      cvar mapname 

-      maxPaintChars 12

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 40 256 20

-      type 4

-      style 0	

-      text "Time Limit:"

-      maxPaintChars 12

-      cvar timelimit 

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 55 256 20

-      type 4

-      style 0	

-      text "Protocol:"

-      cvar protocol 

-      maxPaintChars 12

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 70 256 20

-      type 4

-      style 0	

-      text "Max Clients:"

-      cvar sv_maxclients 

-      maxPaintChars 12

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 85 256 20

-      type 4

-      style 0	

-      text "Host Name:"

-      cvar sv_hostname 

-      maxPaintChars 12

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 100 256 20

-      type 11

-      style 0	

-      text "Password Required:"

-      cvar g_needpass 

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name about

-      rect 0 115 256 20

-      type 11

-      style 0	

-      text "DM Flags:"

-      cvar g_dmflags 

-      textalign ITEM_ALIGN_RIGHT		

-      textalignx 128

-      textaligny 12    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-    

-    itemDef

-    {

-      name about

-      rect 0 130 256 20

-      type 4

-      style 0	

-      text "Version:"

-      cvar version 

-      maxPaintChars 32

-      textalign ITEM_ALIGN_LEFT		

-      textalignx 128

-      textaligny 12

-      textalign 1    

-      textscale .25     

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-  }

-}

diff --git a/tremulous_ui/ingame_callteamvote.menu b/tremulous_ui/ingame_callteamvote.menu
deleted file mode 100644
index 1b944e00..00000000
--- a/tremulous_ui/ingame_callteamvote.menu
+++ /dev/null
@@ -1,175 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "ingame_callteamvote"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick			// this closes the window if it gets a click out of the rectangle

-    rect 37 56 250 157

-    focusColor 1 .75 0 1

-    onopen 

-    {

-      hide grpCallVote;

-      show teamKick;

-

-      setitemcolor teamKickBtn  forecolor 0.2 0.2 0.2 1.0;

-    }

-

-    itemDef

-    {

-      name window

-      rect 10 5 230 147

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name teamKickBtn

-      text "Team Kick"

-      textscale .25

-      group grpbutton

-      rect 20 40 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show teamKick;

-

-        setitemcolor teamKickBtn  forecolor 0.2 0.2 0.2 1.0;

-      }

-    }

-

-

-    // 	TEAM KICK PLAYER	//

-

-    itemDef

-    {

-      name teamKick

-      group grpCallVote

-      text "Team Kick Player:"

-      textscale .25

-      rect 70 15 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      decoration

-    }

-    

-    itemDef

-    {

-      name teamKick

-      group grpCallVote

-      rect 70 35 150 85

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_LISTBOX

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TEAM_LIST

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name teamKick

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 173 125 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteTeamKick;

-        uiScript closeingame

-      }

-    }

-

-

-    // 	KICK PLAYER	//

-

-    itemDef

-    {

-      name kick

-      group grpCallVote

-      text "Kick Player:"

-      textscale .25

-      rect 70 15 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      decoration

-    }

-    

-    itemDef

-    {

-      name kick

-      group grpCallVote

-      rect 70 35 150 85

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_LISTBOX

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_PLAYER_LIST

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name kick

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 173 125 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteKick;

-        uiScript closeingame

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/ingame_callvote.menu b/tremulous_ui/ingame_callvote.menu
deleted file mode 100644
index f1cf2c7a..00000000
--- a/tremulous_ui/ingame_callvote.menu
+++ /dev/null
@@ -1,276 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "ingame_callvote"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick			// this closes the window if it gets a click out of the rectangle

-    rect 37 56 250 157

-    focusColor 1 .75 0 1

-    onopen 

-    {

-      uiScript loadArenas;

-      hide grpCallVote;

-      show misc;

-

-      setitemcolor miscBtn      forecolor 0.2 0.2 0.2 1.0;

-      setitemcolor kickBtn      forecolor 1.0 1.0 1.0 1.0;

-      setitemcolor mapBtn       forecolor 1.0 1.0 1.0 1.0;

-    }

-

-    itemDef

-    {

-      name window

-      rect 10 5 230 147

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name miscBtn

-      text "Misc"

-      textscale .25

-      group grpbutton

-      rect 20 40 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show misc;

-

-        setitemcolor miscBtn      forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor kickBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor mapBtn       forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-    

-    itemDef

-    {

-      name kickBtn

-      text "Kick"

-      textscale .25

-      group grpbutton

-      rect 20 65 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show kick;

-

-        setitemcolor miscBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor kickBtn      forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor mapBtn       forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-    

-    itemDef

-    {

-      name mapBtn

-      text "Map"

-      textscale .25

-      group grpbutton

-      rect 20 90 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show map;

-

-        setitemcolor miscBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor kickBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor mapBtn       forecolor 0.2 0.2 0.2 1.0

-      }

-    }

-

-

-    // 	MISC	//		

-		 

-    itemDef

-    {

-      name misc

-      text "Restart Map"

-      group grpCallVote

-      textscale .25

-      rect 90 45 96 20

-      type 1

-      textalign 1

-      textalignx 50

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "cmd callvote map_restart";

-        uiScript closeingame

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group grpCallVote

-      text "Next Map"

-      textscale .25

-      rect 90 75 96 20

-      type 1

-      textalign 1

-      textalignx 50

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "cmd callvote nextmap";

-        uiScript closeingame

-      }

-    }

-    

-    

-    // 	KICK PLAYER	//

-

-    itemDef

-    {

-      name kick

-      group grpCallVote

-      text "Kick Player:"

-      textscale .25

-      rect 70 15 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      decoration

-    }

-    

-    itemDef

-    {

-      name kick

-      group grpCallVote

-      rect 70 35 150 85

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_LISTBOX

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_PLAYER_LIST

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name kick

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 173 125 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteKick;

-        uiScript closeingame

-      }

-    }

-

-

-    // 	NEW MAP	//

-

-    itemDef

-    {

-      name map

-      group grpCallVote

-      text "New Map:"

-      ownerdraw UI_ALLMAPS_SELECTION 

-      textscale .25

-      rect 70 15 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      decoration

-      visible 0

-    }

-    

-    itemDef

-    {

-      name map

-      group grpCallVote

-      rect 70 35 150 85

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_ALLMAPS

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1 

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name map

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 173 125 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteMap;

-        uiScript closeingame

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/ingame_leave.menu b/tremulous_ui/ingame_leave.menu
deleted file mode 100644
index 3e6071c3..00000000
--- a/tremulous_ui/ingame_leave.menu
+++ /dev/null
@@ -1,331 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ INGAME_LEAVE MENU \\

-

-  menuDef

-  {

-    name "ingame_leave"

-    visible 1

-    fullScreen 0

-    outOfBoundsClick      // this closes the window if it gets a click out of the rectangle

-    rect 160 56 128 125

-    focusColor 1 .75 0 1

-    onOpen

-    {

-      show grpMenu;

-      hide grpConfirm

-    }

-

-    itemDef

-    {

-      name leave

-      style WINDOW_STYLE_FILLED

-      rect 5 5 107 90 

-      backcolor 0 0 0 1

-      visible 1 

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name leave

-      text "Main Menu"

-      group grpMenu

-      style WINDOW_STYLE_EMPTY 

-      rect 0 20 128 20 

-      type 1  

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpMenu;

-        show leaveConfirm

-      }

-    }

-

-    itemDef

-    {

-      name leave

-      group grpMenu

-      text "Restart"

-      style WINDOW_STYLE_EMPTY 

-      type 1

-      rect 0 40 128 20   

-      textalign 1 

-      textalignx 65 

-      textaligny 18

-      textscale .25

-      forecolor  1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpMenu;

-        show restartConfirm

-      }

-    }

-

-    itemDef

-    {

-      name leave

-      group grpMenu

-      type 1

-      text "Quit"

-      style WINDOW_STYLE_EMPTY 

-      rect 0 60 128 20   

-      textalign 1 

-      textalignx 64 

-      textaligny 18

-      textscale .25

-      forecolor  1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpMenu;

-        show quitConfirm

-      }

-    }

-

-

-    // CONFIRMS //

-

-

-    itemDef

-    {

-      name leaveConfirm

-      text "Exit to"

-      group grpConfirm

-      style WINDOW_STYLE_EMPTY 

-      rect 0 23 128 20   

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      decoration

-      forecolor 1 1 1 1

-      visible 1 

-    }

-

-    itemDef

-    {

-      name leaveConfirm

-      text "Main Menu?"

-      group grpConfirm

-      style WINDOW_STYLE_EMPTY 

-      rect 0 40 128 20   

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      decoration

-      forecolor 1 1 1 1

-      visible 1 

-    }

-

-    itemDef

-    {

-      name leaveConfirm

-      text "Yes"

-      group grpConfirm

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 18 70 40 20

-      textalign 1

-      textalignx 20

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript leave

-      }

-    }

-

-    itemDef

-    {

-      name leaveConfirm

-      text "No"

-      group grpConfirm

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 70 70 40 20

-      textalign 1

-      textalignx 20

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        hide grpConfirm;

-        show grpMenu

-      }

-    }

-

-    itemDef

-    {

-      name restartConfirm

-      text "Want to"

-      group grpConfirm

-      style WINDOW_STYLE_EMPTY 

-      rect 0 23 128 20   

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      decoration

-      forecolor 1 1 1 1

-      visible 1 

-    }

-    

-    itemDef

-    {

-      name restartConfirm

-      text "Restart Map?"

-      group grpConfirm

-      style WINDOW_STYLE_EMPTY 

-      rect 0 40 128 20   

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      decoration

-      forecolor 1 1 1 1

-      visible 1 

-    }

-

-    itemDef

-    {

-      name restartConfirm

-      text "Yes"

-      group grpConfirm

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 18 70 40 20

-      textalign 1

-      textalignx 20

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "map_restart";

-        close ingame_leave;

-        close ingame

-      }

-    }

-

-    itemDef

-    {

-      name restartConfirm

-      text "No"

-      group grpConfirm

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 70 70 40 20

-      textalign 1

-      textalignx 20

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        hide grpConfirm;

-        show grpMenu

-      }

-    }

-

-    itemDef

-    {

-      name quitConfirm

-      text "Want to"

-      group grpConfirm

-      style WINDOW_STYLE_EMPTY 

-      rect 0 23 128 20   

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      forecolor 1 1 1 1

-      decoration

-      visible 1 

-    }

-    

-    itemDef

-    {

-      name quitConfirm

-      text "Quit Game?"

-      group grpConfirm

-      style WINDOW_STYLE_EMPTY 

-      rect 0 40 128 20   

-      textalign 1 

-      textalignx 64

-      textaligny 18        

-      textscale .25

-      forecolor 1 1 1 1

-      decoration

-      visible 1 

-    }

-

-    itemDef

-    {

-      name quitConfirm

-      text "Yes"

-      group grpConfirm

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 18 70 40 20

-      textalign 1

-      textalignx 20

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript quit

-      }

-    }

-

-    itemDef

-    {

-      name quitConfirm

-      text "No"

-      group grpConfirm

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 70 70 40 20

-      textalign 1

-      textalignx 20

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 1

-      action

-      { 

-        play "sound/misc/menu3.wav"; 

-        hide grpConfirm;

-        show grpMenu

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/ingame_options.menu b/tremulous_ui/ingame_options.menu
deleted file mode 100644
index 210818c1..00000000
--- a/tremulous_ui/ingame_options.menu
+++ /dev/null
@@ -1,1991 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ INGAME OPTIONS BOX \\

-

-  menuDef

-  {

-    name "ingame_options"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick      // this closes the window if it gets a click out of the rectangle

-    rect 10 56 292 280

-    focusColor 1 .75 0 1

-    onopen

-    {

-      hide optionsGrp;

-      show game;

-

-      setitemcolor gameBtn      forecolor 0.2 0.2 0.2 1.0;

-      setitemcolor controlsBtn  forecolor 1.0 1.0 1.0 1.0;

-      setitemcolor systemBtn    forecolor 1.0 1.0 1.0 1.0

-    }

-

-    itemDef

-    {

-      name window

-      rect 10 5 292 270

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    //Section menus

-    itemDef

-    {

-      name GameBtn

-      text "Game"

-      group menuGrp

-      style WINDOW_STYLE_EMPTY

-      rect 90 20 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER 

-      textalignx 34

-      textaligny 18

-      textscale .35

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show game;

-        

-        setitemcolor gameBtn      forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor controlsBtn  forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor systemBtn    forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-

-    itemDef

-    {

-      name controlsBtn

-      text "Controls"

-      group menuGrp

-      style WINDOW_STYLE_EMPTY

-      rect 160 20 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER 

-      textalignx 34

-      textaligny 18        

-      textscale .35

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show controls;

-        show look;

-        

-        setitemcolor gameBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor controlsBtn  forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor systemBtn    forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-

-    itemDef

-    {

-      name systemBtn

-      text "System"

-      group menuGrp

-      style WINDOW_STYLE_EMPTY

-      rect 230 20 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER 

-      textalignx 34

-      textaligny 18        

-      textscale .35

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show system;

-        show ghardware;

-        

-        setitemcolor gameBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor controlsBtn  forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor systemBtn    forecolor 0.2 0.2 0.2 1.0

-      }

-    }

-

-//////// GAME

-

-    itemDef

-    {

-      name game

-      group optionsGrp

-      type ITEM_TYPE_EDITFIELD

-      style 0

-      text "Name:"

-      cvar "name"

-      maxchars 26

-      rect 90 85 192 15

-      textalign ITEM_ALIGN_LEFT		

-      textalignx 64 

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-    }

-    

-    itemDef

-    {

-      name game

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Auto Download:"

-      cvar "cl_allowDownload"

-      rect 90 120 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name game				

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Taunts Off:"

-      cvar "cg_noTaunt"

-      rect 90 135 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name game				

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Team Chats Only:"

-      cvar "cg_teamChatsOnly"

-      rect 90 150 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name game				

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Auto Wallwalk Pitching:"

-      cvar "cg_wwFollow"

-      rect 90 165 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name game

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Wallwalking Speed:"

-      cvarfloat "cg_wwSmoothTime" 300 0 1000

-      cvarFloatList { "Medium" 300 "Fast" 150 "Instant" 0 "Slow" 600 }

-      rect 90 180 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128 

-      textaligny 12

-      textscale .25         

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name game				

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Wallwalk Control Toggles:"

-      cvar "cg_wwToggle"

-      rect 90 195 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name game

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Disable Warning Dialogs:"

-      cvar "cg_disableWarningDialogs"

-      rect 90 210 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128 

-      textaligny 12

-      textscale .25         

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-

-//////// CONTROLS

-

-    //Controls menu

-    itemDef

-    {

-      name controls

-      text "Look"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 60 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show controls;

-        show look

-      }

-    }

-

-//////// LOOK

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Lookup:"

-      cvar "+lookup"

-      rect 96 85 192 15 

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12   

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Look Down:"

-      cvar "+lookdown"

-      rect 96 100 192 15 

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Mouse Look:"

-      cvar "+mlook"

-      rect 96 115 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-  

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Centerview:"

-      cvar "centerview"

-      rect 96 130 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "ZoomView:"

-      cvar "+zoom"

-      rect 96 145 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Free Look:"

-      cvar "cl_freelook"

-      rect 96 160 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_SLIDER

-      text "Mouse Sensitivity:"

-      cvarfloat "sensitivity" 5 1 30

-      rect 96 175 192 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 15

-      textscale .25          

-      forecolor 1 1 1 1

-      visible 0 

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Invert Mouse:"

-      cvar "ui_mousePitch"

-      rect 96 195 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25               

-      forecolor 1 1 1 1

-      visible 0 

-      action 

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript update ui_mousePitch

-      }

-    }

-

-    itemDef

-    {

-      name look

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Smooth Mouse:"

-      cvar "m_filter"

-      rect 96 210 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25             

-      forecolor 1 1 1 1

-      visible 0 

-      action 

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-        

-//////// MOVE

-

-    itemDef

-    {

-      name controls

-      text "Move"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 80 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show controls;

-        show move

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Always Run:"

-      cvar "cl_run"

-      rect 96 65 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Run / Walk:"

-      cvar "+speed"

-      rect 96 80 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Sprint:"

-      cvar "boost"

-      rect 96 95 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Forward:"

-      cvar "+forward"

-      rect 96 110 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Backpedal:"

-      cvar "+back"

-      rect 96 125 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-  

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Move Left:"

-      cvar "+moveleft"

-      rect 96 140 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Move Right:"

-      cvar "+moveright"

-      rect 96 155 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Jump:"

-      cvar "+moveup"

-      rect 96 170 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Crouch:"

-      cvar "+movedown"

-      rect 96 185 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Turn Left:"

-      cvar "+left"

-      rect 96 200 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Turn Right:"

-      cvar "+right"

-      rect 96 215 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-  

-    itemDef

-    {

-      name move

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Strafe:"

-      cvar "+strafe"

-      rect 96 230 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-

-

-//////// UPGRADES

-

-    itemDef

-    {

-      name controls

-      text "Upgrades"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 100 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show controls;

-        show upgrades

-      }

-    }

-

-    itemDef

-    {

-      name upgrades        

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Primary Attack:"

-      cvar "+attack"

-      rect 96 90 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name upgrades        

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Secondary Attack:"

-      cvar "+button5"

-      rect 96 105 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name upgrades

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Previous Upgrade:"

-      cvar "weapprev"

-      rect 96 120 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name upgrades

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Next Upgrade:"

-      cvar "weapnext"

-      rect 96 135 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25       

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name upgrades

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Activate Upgrade:"

-      cvar "+button2"

-      rect 96 150 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25       

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name upgrades

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Reload:"

-      cvar "reload"

-      rect 96 165 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25       

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name upgrades

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Buy Ammo:"

-      cvar "buy ammo"

-      rect 96 180 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25       

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name upgrades

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Use Medkit:"

-      cvar "itemact medkit"

-      rect 96 195 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25       

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-//////// MISC

-

-    itemDef

-    {

-      name controls

-      text "Misc"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 120 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show controls;

-        show misc

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Show Scores:"

-      cvar "+scores"

-      rect 96 80 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25                  

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-  

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Scroll Scores Up:"

-      cvar "scoresUp"

-      rect 96 95 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25               

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-    

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Scroll Scores Down:"

-      cvar "scoresDown"

-      rect 96 110 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25               

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Use Structure/Evolve:"

-      cvar "+button7"

-      rect 96 125 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25             

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-        

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Deconstruct Structure:"

-      cvar "deconstruct"

-      rect 96 140 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25             

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-        

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Gesture:"

-      cvar "+button3"

-      rect 96 155 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25           

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-  

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Chat:"

-      cvar "messagemode"

-      rect 96 170 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25             

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Team Chat:"

-      cvar "messagemode2"

-      rect 96 185 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25            

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Target Chat:"

-      cvar "messagemode3"

-      rect 96 200 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25              

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group optionsGrp

-      type ITEM_TYPE_BIND

-      text "Attack Chat:"

-      cvar "messagemode4"

-      rect 96 215 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      maxPaintChars 20

-      textaligny 12

-      textscale .25             

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-//////// SYSTEM

-

-    //System menu

-    itemDef

-    {

-      name system

-      text "GFX Hardware"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 60 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show system;

-        show ghardware

-      }

-    }

-

-//////// GFX HARDWARE

-

-    itemDef

-    {

-      name ghardware       

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Quality:"

-      cvar "ui_glCustom"

-      cvarFloatList { "High Quality" 0 "Normal" 1 "Fast" 2 "Fastest" 3 "Custom" 4 }

-      rect 96 55 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25         

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript update "ui_glCustom"

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_EDITFIELD

-      text "GL Driver:"

-      cvar "r_gldriver"

-      //cvarFloatList {  }

-      rect 96 70 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      decoration

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "GL Extensions:"

-      cvar "r_allowExtensions"

-      rect 96 85 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCuston

-      }

-    }

-  

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Video Mode:"

-      cvar "r_mode"

-      cvarFloatList { "320x240" 0 "400x300" 1 "512x384" 2 "640x480" 3

-                      "800x600" 4 "960x720" 5 "1024x768" 6 "1152x864" 7

-                      "1280x1024" 8 "1600x1200" 9 "2048x1536" 10 "856x480 wide screen" 11 }

-      rect 96 100 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Color Depth:"

-      cvar "r_colorbits"

-      cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }

-      rect 96 115 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom;

-        uiScript update "r_colorbits"

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Fullscreen:"

-      cvar "r_fullscreen"

-      rect 96 130 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Lighting:"

-      cvar "r_vertexlight"

-      cvarFloatList { "Light Map (high)" 0 "Vertex (low)" 1  }

-      rect 96 145 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Geometric Detail:"

-      cvar "r_lodbias"

-      cvarFloatList { "High" 0 "Medium" 1 "Low" 2 }

-      rect 96 160 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom;

-        uiScript update "r_lodbias"

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Texture Detail:"

-      cvar "r_picmip"

-      cvarFloatList { "Low" 2 "Normal" 1 "High" 0 }

-      rect 96 175 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom

-      }

-    }

-  

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Texture Quality:"

-      cvar "r_texturebits"

-      cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 }

-      rect 96 190 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Texture Filter:"

-      cvar "r_texturemode"

-      cvarStrList { "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", "Trilinear", "GL_LINEAR_MIPMAP_LINEAR"  }

-      rect 96 205 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Compress Textures:"

-      cvar "r_ext_compressed_textures "

-      rect 96 220 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript glCustom

-      }

-    }

-

-    itemDef

-    {

-      name ghardware

-      group optionsGrp

-      type ITEM_TYPE_BUTTON

-      text "APPLY"

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 144 240 75 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 37

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "vid_restart"

-      }

-    }

-

-//////// GFX SOFTWARE

-

-    itemDef

-    {

-      name system

-      text "GFX Software"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 80 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show system;

-        show gsoftware

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_SLIDER

-      text "Brightness:"

-      cvarfloat "r_gamma" 1 .5 2

-      rect 96 60 192 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 80

-      textaligny 17

-      textscale .25         

-      forecolor 1 1 1 1

-      visible 0 

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_SLIDER

-      text "Screen Size:"

-      cvarfloat "cg_viewsize" 100 30 100

-      //cvarFloatList {  }

-      rect 96 80 192 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 80

-      textaligny 17

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Simple Items:"

-      cvar "cg_simpleItems"

-      rect 96 100 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Marks On Walls:"

-      cvar "cg_marks"

-      rect 96 115 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-        

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_MULTI  

-      text "Ejecting Brass:"

-      cvar "cg_brassTime"

-      cvarFloatList { "High" 2500 "Med" 1250 "Off" 0 }

-      rect 96 130 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Dynamic Lights:"

-      cvar "r_dynamiclight"

-      rect 96 145 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Draw Gun:"

-      cvar "cg_drawGun"

-      rect 96 160 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Low Quality Sky:"

-      cvar "r_fastsky"

-      rect 96 175 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Sync Every Frame:"

-      cvar "weapon 5"

-      rect 96 190 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Show Time:"

-      cvar "cg_drawTimer"

-      rect 96 205 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware        

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "In Game Videos:"

-      cvar "r_inGameVideo"

-      rect 96 220 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware        

-      group optionsGrp

-      type ITEM_TYPE_YESNO

-      text "Depth Sort Particles:"

-      cvar "cg_depthSortParticles"

-      rect 96 235 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name gsoftware        

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Light Flares:"

-      cvar "cg_lightFlare"

-      cvarFloatList { "Off" 0 "No Fade" 1 "Timed Fade" 2 "Real Fade" 3 }

-      rect 96 250 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-//////// GL INFO

-

-    itemDef

-    {

-      name system

-      text "GL Info"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 100 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show system;

-        show glinfo

-      }

-    }

-

-    itemDef

-    {

-      name glinfo

-      group optionsGrp

-      rect 104 35 230 230 

-      ownerdraw UI_GLINFO 

-      textalign 1

-      textscale .15

-      textalignx 0

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 0

-      decoration

-    }

-

-//////// NET & SOUND

-  

-    itemDef

-    {

-      name system

-      text "Net & Sound"

-      group optionsGrp

-      style WINDOW_STYLE_EMPTY

-      rect 20 120 64 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 64

-      textaligny 16

-      textscale .25

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide optionsGrp;

-        show system;

-        show netsound

-      }

-    }

-

-    itemDef

-    {

-      name netsound      

-      group optionsGrp

-      style 1

-      text "Sound"

-      rect 96 70 192 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 80

-      textaligny 17

-      textscale .25         

-      forecolor 1 1 1 1

-      visible 0 

-      decoration

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name netsound

-      group optionsGrp

-      type ITEM_TYPE_SLIDER

-      text "Effects Volume:"

-      cvarfloat "s_volume" 0.7 0 1

-      rect 96 90 192 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      textaligny 17

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-    }

-  

-    itemDef

-    {

-      name netsound

-      group optionsGrp

-      type ITEM_TYPE_SLIDER

-      text "Music Volume:"

-      cvarfloat "s_musicvolume" 0.25 0 1

-      rect 96 110 192 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 90

-      textaligny 17

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-    }

-

-    itemDef

-    {

-      name netsound

-      group optionsGrp

-      type ITEM_TYPE_MULTI  

-      text "Sound Quality:"

-      cvar "s_khz"

-      cvarFloatList { "22 khz (high)" 22 "11 khz (low)" 11 }

-      rect 96 130 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name netsound

-      group optionsGrp

-      type ITEM_TYPE_YESNO  

-      text "Doppler Sound:"

-      cvar "s_doppler"

-      rect 96 145 192 15

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 12

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-  

-    itemDef

-    {

-      name netsound      

-      group optionsGrp

-      style 1

-      text "Network"

-      rect 96 190 192 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 80

-      textaligny 17

-      textscale .25         

-      forecolor 1 1 1 1

-      visible 0 

-      decoration

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-

-    itemDef

-    {

-      name netsound

-      group optionsGrp

-      type ITEM_TYPE_MULTI

-      text "Net Data Rate:"

-      cvar "rate"

-      cvarFloatList { "<=28.8k" 2500 "33.6k" 3000 "56k" 4000 "ISDN" 5000 "LAN/CABLE/xDSl" 25000  }

-      rect 96 210 192 20

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 100

-      textaligny 17

-      textscale .25        

-      forecolor 1 1 1 1

-      visible 0 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/ingame_vote.menu b/tremulous_ui/ingame_vote.menu
deleted file mode 100644
index 7db61f5f..00000000
--- a/tremulous_ui/ingame_vote.menu
+++ /dev/null
@@ -1,515 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ VOTE MENU \\

-

-  menuDef

-  {

-    name "ingame_vote"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick			// this closes the window if it gets a click out of the rectangle

-    rect 27 56 260 107

-    focusColor 1 .75 0 1

-

-    itemDef

-    {

-      name window

-      ownerdrawflag UI_SHOW_CANVOTE

-      ownerdrawflag UI_SHOW_CANTEAMVOTE

-      rect 10 5 240 47

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name window

-      ownerdrawflag UI_SHOW_VOTEACTIVE

-      ownerdrawflag UI_SHOW_CANTEAMVOTE

-      rect 10 5 240 72

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name window

-      ownerdrawflag UI_SHOW_TEAMVOTEACTIVE

-      rect 10 5 240 97

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_KCGRADIENT

-      borderSize 2.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name callvote

-      text "Call Vote"

-      type 1

-      ownerdrawflag UI_SHOW_CANVOTE

-      textscale .35

-      rect 30 20 100 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 50

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close ingame_vote;

-        open ingame_callvote

-      }

-    }

-

-    itemDef

-    {

-      name callteamvote

-      text "Call Team Vote"

-      type 1

-      ownerdrawflag UI_SHOW_CANTEAMVOTE

-      textscale .35

-      rect 130 20 100 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 50

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close ingame_vote;

-        open ingame_callteamvote

-      }

-    }

-

-    itemDef

-    {

-      name yes

-      text "Vote Yes"

-      type 1

-      ownerdrawflag UI_SHOW_VOTEACTIVE

-      textscale .35

-      rect 30 45 100 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 50

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "vote yes";

-        uiScript closeingame

-      }

-    }

-

-    itemDef

-    {

-      name no

-      text "Vote No"

-      type 1

-      ownerdrawflag UI_SHOW_VOTEACTIVE

-      textscale .35

-      rect 130 45 100 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 50

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        exec "vote no";

-        uiScript closeingame

-      }

-    }

-

-    itemDef

-    {

-      name teamyes

-      text "Team Vote Yes"

-      type 1

-      ownerdrawflag UI_SHOW_TEAMVOTEACTIVE

-      textscale .35

-      rect 30 70 100 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 50

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "teamvote yes";

-        uiScript closeingame

-      }

-    }

-

-    itemDef

-    {

-      name teamno

-      text "Team Vote No"

-      type 1

-      ownerdrawflag UI_SHOW_TEAMVOTEACTIVE

-      textscale .35

-      rect 130 70 100 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 50

-      textaligny 17

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        exec "teamvote no";

-        uiScript closeingame

-      }

-    }

-

-/*    itemDef

-    {

-      name miscBtn

-      text "Misc"

-      textscale .25

-      group grpbutton

-      rect 20 75 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show misc;

-

-        setitemcolor miscBtn      forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor kickBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor teamKickBtn  forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor mapBtn       forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-    

-    itemDef

-    {

-      name kickBtn

-      text "Kick"

-      textscale .25

-      group grpbutton

-      rect 20 100 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show kick;

-

-        setitemcolor miscBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor kickBtn      forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor teamKickBtn  forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor mapBtn       forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-    

-    itemDef

-    {

-      name teamKickBtn

-      text "Team Kick"

-      textscale .25

-      group grpbutton

-      rect 20 125 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show teamKick;

-

-        setitemcolor miscBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor kickBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor teamKickBtn  forecolor 0.2 0.2 0.2 1.0;

-        setitemcolor mapBtn       forecolor 1.0 1.0 1.0 1.0

-      }

-    }

-    

-    itemDef

-    {

-      name mapBtn

-      text "Map"

-      textscale .25

-      group grpbutton

-      rect 20 150 45 20

-      type ITEM_TYPE_BUTTON

-      textalign ITEM_ALIGN_CENTER

-      textalignx 22

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        hide grpCallVote;

-        show map;

-

-        setitemcolor miscBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor kickBtn      forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor teamKickBtn  forecolor 1.0 1.0 1.0 1.0;

-        setitemcolor mapBtn       forecolor 0.2 0.2 0.2 1.0

-      }

-    }

-

-

-    // 	MISC	//		

-		 

-    itemDef

-    {

-      name misc

-      text "Restart Map"

-      group grpCallVote

-      textscale .25

-      rect 100 105 96 20

-      type 1

-      textalign 1

-      textalignx 50

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "cmd callvote map_restart";

-        uiScript closeingame

-      }

-    }

-

-    itemDef

-    {

-      name misc

-      group grpCallVote

-      text "Next Map"

-      textscale .25

-      rect 100 135 96 20

-      type 1

-      textalign 1

-      textalignx 50

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        exec "cmd callvote nextmap";

-        uiScript closeingame

-      }

-    }

-    

-    

-    // 	KICK PLAYER	//

-

-    itemDef

-    {

-      name kick

-      group grpCallVote

-      text "Kick Player:"

-      textscale .25

-      rect 80 75 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      decoration

-    }

-    

-    itemDef

-    {

-      name kick

-      group grpCallVote

-      rect 80 95 150 85

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_LISTBOX

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_PLAYER_LIST

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name kick

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 183 185 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteKick;

-        uiScript closeingame

-      }

-    }

-

-

-    // 	TEAM KICK PLAYER	//

-

-    itemDef

-    {

-      name teamKick

-      group grpCallVote

-      text "Team Kick Player:"

-      textscale .25

-      rect 80 75 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 0

-      decoration

-    }

-    

-    itemDef

-    {

-      name teamKick

-      group grpCallVote

-      rect 80 95 150 85

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_LISTBOX

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TEAM_LIST

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name teamKick

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 183 185 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteTeamKick;

-        uiScript closeingame

-      }

-    }

-

-

-    // 	NEW MAP	//

-

-    itemDef

-    {

-      name map

-      group grpCallVote

-      text "New Map:"

-      ownerdraw UI_ALLMAPS_SELECTION 

-      textscale .25

-      rect 80 75 110 20

-      textalign 0

-      textalignx 0

-      textaligny 16

-      forecolor 1 1 1 1

-      decoration

-      visible 0

-    }

-    

-    itemDef

-    {

-      name map

-      group grpCallVote

-      rect 80 95 150 85

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 15

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_ALLMAPS

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1 

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 0

-    }

-

-    itemDef

-    {

-      name map

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      textscale .25

-      group grpCallVote

-      rect 183 185 50 20

-      textalign 1

-      textalignx 25

-      textaligny 15

-      forecolor 1 1 1 1

-      visible 0

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript voteMap;

-        uiScript closeingame

-      }

-    }*/

-  }

-}

diff --git a/tremulous_ui/joinserver.menu b/tremulous_ui/joinserver.menu
deleted file mode 100644
index ace7a90a..00000000
--- a/tremulous_ui/joinserver.menu
+++ /dev/null
@@ -1,772 +0,0 @@
-#include "ui/menudef.h"

-

-{

-

-  \\ Server Join \\

-

-  menuDef

-  {

-    name "joinserver"

-    visible 0

-    fullscreen 1

-    rect 0 0 640 480

-    focusColor 1 .75 0 1

-    outOfBoundsClick  

-    style 0

-    onOpen

-    {

-      uiScript UpdateFilter;

-      hide accept_alt; 

-      show accept;

-      hide back_alt;

-      show back;

-      hide grpmessage

-    }

-    

-    onEsc { uiScript closeJoin }

-

-    itemDef

-    {

-      name background

-      rect 0 0 640 480

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-    }

-

-    // DATE AND MESSAGE OF THE DAY  //

-

-    itemDef

-    {

-      name datewindow

-      rect 10 365 265 25

-      style WINDOW_STYLE_FILLED 

-      border 1

-      bordercolor .5 .5 .5 1

-      backcolor 0 0 0 .15

-      visible 1

-    }

-    

-    itemDef

-    {

-      name messagewindow

-      rect 275 365 355 25

-      style WINDOW_STYLE_FILLED 

-      border 1

-      bordercolor .5 .5 .5 1

-      backcolor 0 0 0 .15

-      visible 1

-    }

-

-    itemDef

-    {

-      name refreshdate

-      ownerdraw UI_SERVERREFRESHDATE

-      textscale .33

-      rect 10 365 265 25

-      textalign 0

-      textalignx 10   

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      decoration 

-    }

-    

-    itemDef

-    {

-      name messageoftheday

-      ownerdraw UI_SERVERMOTD

-      textscale .33

-      rect 280 365 345 25

-      forecolor 1 1 1 1

-      visible 1 

-      decoration

-    }

-

-

-    //  VIEW OPTIONS  //

-

-    itemDef

-    {

-      name gametypefield

-      style WINDOW_STYLE_EMPTY

-      ownerdraw UI_NETSOURCE

-      rect 26 20 128 26

-      textalign ITEM_ALIGN_LEFT   

-      textalignx 10    

-      textaligny 22    

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 .5 .5 .5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"

-      }

-    }

-

-    //  BUTTONS   //

-

-    itemDef

-    {

-      name refreshSource

-      text "Get New List"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_EMPTY

-      rect 190 20 128 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 22

-      backcolor .5 .5 .5 .5

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav";

-        uiScript RefreshServers

-      }       

-    }

-

-    itemDef

-    {

-      name refreshFilter

-      text "Refresh List"

-      textscale .4

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_BUTTON

-      rect 354 20 128 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 22

-      backcolor .5 .5 .5 .5

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav";

-        uiScript RefreshFilter

-      }        

-    }

-

-    itemDef

-    {

-      name viewEmpty

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_YESNO

-      text "View Empty:"

-      cvar "ui_browserShowEmpty"

-      textscale .4

-      rect 26 50 128 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10    

-      textaligny 22

-      forecolor 1 1 1 1

-      backcolor .5 .5 .5 .5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav";

-        uiScript RefreshFilter

-      }

-    }

-    

-    itemDef

-    {

-      name viewFull

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_YESNO

-      text "View Full:"

-      cvar "ui_browserShowFull"

-      textscale .4

-      rect 190 50 128 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10    

-      textaligny 22

-      forecolor 1 1 1 1

-      backcolor .5 .5 .5 .5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav";

-        uiScript RefreshFilter

-      }

-    }

-

-    itemDef

-    {

-      name        PunkBusterInfo

-      group       pbgrp

-      text        "PunkBuster:"

-      type        ITEM_TYPE_BUTTON

-      cvar        "ui_browserShowEmpty"

-      textscale   .4

-      style       WINDOW_STYLE_FILLED

-      rect        354 50 128 26

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  10

-      textaligny  22

-      backcolor   0 0 0 0

-      forecolor   1 1 1 1

-      visible     1

-      action 

-      {

-        play "sound/misc/menu1.wav";

-        conditionalopen cl_punkbuster pbdisable_popmenu pbenable_popmenu

-      }

-    }

-

-    itemDef

-    {

-      name          pbstatus

-      group         pbgrp

-      type          ITEM_TYPE_MULTI

-      text          ""

-      cvar          "cl_punkbuster"

-      cvarFloatList { "Off" 0 "On" 1 }

-      rect          438 50 64 26

-      textalign     ITEM_ALIGN_CENTER

-      textalignx    10

-      textaligny    22

-      textscale     .4     

-      forecolor     1 1 1 1

-      style         WINDOW_STYLE_FILLED

-      backcolor     0 0 0 0

-      visible       1

-      decoration

-      }

-

-

-    // map selection

-

-    itemDef

-    {

-      name mappreview

-      style 0 

-      ownerdraw UI_NETMAPCINEMATIC

-      rect 502 5 128 96

-      border 1

-      bordercolor 0 .5 0 .5

-      visible 1 

-    }

-

-    itemDef

-    {

-      name mappreview

-      style WINDOW_STYLE_FILLED 

-      rect 502 5 128 96 

-      border 1

-      bordercolor .5 .5 .5 .5

-      visible 1 

-    }

-

-    //  COLUMNS //

-

-    itemDef

-    {

-      name serverColumn

-      group grpColumn

-      rect 10 130 333 232

-      style WINDOW_STYLE_FILLED

-      border 1

-      backcolor 0 0 0 0

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-    

-    itemDef

-    {

-      name mapColumn

-      group grpColumn

-      rect 343 130 125 232

-      style WINDOW_STYLE_FILLED

-      border 1

-      backcolor 0 0 0 0

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-    

-    itemDef

-    {

-      name playerColumn

-      group grpColumn

-      rect 468 130 60 232

-      style WINDOW_STYLE_FILLED

-      border 1

-      backcolor 0 0 0 0

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-    

-    itemDef

-    {

-      name pbColumn

-      group grpColumn

-      rect 528 130 32 232

-      style WINDOW_STYLE_FILLED

-      border 1

-      backcolor 0 0 0 0

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name pingColumn

-      group grpColumn

-      rect 560 130 52 232

-      style WINDOW_STYLE_FILLED

-      border 1

-      backcolor 0 0 0 0

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name serverlist

-      rect 10 130 620 232

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_SERVERS

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      columns 5

-        2   40  40  ITEM_ALIGN_LEFT

-        343 40  20  ITEM_ALIGN_LEFT

-        468 5   10  ITEM_ALIGN_LEFT

-        528 5   10  ITEM_ALIGN_LEFT

-        560 20  20  ITEM_ALIGN_LEFT

-

-      doubleClick { uiScript JoinServer }

-    }

-

-

-    //  SORT TABS //

-

-    itemDef

-    {

-      name server

-      group grpTabs

-      text "Server Name"

-      type ITEM_TYPE_BUTTON

-      textscale .33

-      style WINDOW_STYLE_EMPTY

-      rect 10 103 333 26 

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 18

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript ServerSort 0; 

-      

-        setitemcolor grpColumn backcolor 0 0 0 0; 

-        setitemcolor serverColumn backcolor 0.3 1 1 0.5

-      }

-    }

-

-    itemDef

-    {

-      name map

-      group grpTabs

-      type ITEM_TYPE_BUTTON

-      text "Map Name"

-      textscale .33

-      style WINDOW_STYLE_EMPTY

-      rect 343 103 125 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 18

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript ServerSort 1; 

-      

-        setitemcolor grpColumn backcolor 0 0 0 0; 

-        setitemcolor mapColumn backcolor 0.3 1 1 0.5

-      }

-    }

-

-    itemDef

-    {

-      name Players

-      group grpTabs

-      text "Players"

-      type ITEM_TYPE_BUTTON

-      textscale .33

-      style WINDOW_STYLE_EMPTY

-      rect 468 103 60 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 18

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript ServerSort 2; 

-      

-        setitemcolor grpColumn backcolor 0 0 0 0; 

-        setitemcolor playerColumn backcolor 0.3 1 1 0.5

-      }

-    }

-

-    itemDef

-    {

-      name PB

-      group grpTabs

-      text "PB"

-      type ITEM_TYPE_BUTTON

-      textscale .33

-      style WINDOW_STYLE_EMPTY

-      rect 528 103 32 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 18

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript ServerSort 5;

-      

-        setitemcolor grpColumn backcolor 0 0 0 0; 

-        setitemcolor pbColumn backcolor 0.3 1 1 0.5

-      }

-    }

-

-

-    itemDef

-    {

-      name Ping

-      group grpTabs

-      text "Ping"

-      type ITEM_TYPE_BUTTON

-      textscale .33

-      style WINDOW_STYLE_EMPTY

-      rect 560 103 70 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 18

-      border 1

-      bordercolor   0.5 0.5 0.5 1

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript ServerSort 4; 

-      

-        setitemcolor grpColumn backcolor 0 0 0 0; 

-        setitemcolor pingColumn backcolor 0.3 1 1 0.5

-      }

-    }

-

-

-    itemDef

-    {

-      name password

-      text "Password"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_FILLED

-      rect 20 395 92 26

-      textalign 1

-      textalignx 46   // center

-      textaligny 22

-      backcolor 0 0 0 1

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        open password_popmenu

-      }

-    }

-

-    itemDef

-    {

-      name createFavorite

-      text "New Favorite"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_FILLED

-      rect 148 395 92 26

-      textalign 1

-      textalignx 46   // center

-      textaligny 22

-      backcolor 0 0 0 1

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        open createfavorite_popmenu

-      }

-    }

-    

-    itemDef

-    {

-      name addFavorite

-      text "Add Favorite"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_FILLED

-      ownerdrawFlag UI_SHOW_NOTFAVORITESERVERS

-      rect 276 395 92 26

-      textalign 1

-      textalignx 46   // center

-      textaligny 22

-      backcolor 0 0 0 1

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript addFavorite 

-      }

-    }

-

-    itemDef

-    {

-      name delfavorite

-      text "Del. Favorite"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_FILLED

-      ownerdrawFlag UI_SHOW_FAVORITESERVERS

-      rect 276 395 92 26

-      textalign 1

-      textalignx 46   // center

-      textaligny 22

-      backcolor 0 0 0 1

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript DeleteFavorite;

-        uiScript UpdateFilter

-      }

-    }

-    

-    itemDef

-    {

-      name serverinfo

-      text "Server Info"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_FILLED

-      rect 404 395 92 26

-      textalign 1

-      textalignx 46   // center

-      textaligny 22

-      backcolor 0 0 0 1

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav";

-        open serverinfo_popmenu

-      }

-    }

-    

-    itemDef

-    {

-      name findplayer

-      text "Find Friend"

-      type ITEM_TYPE_BUTTON

-      textscale .4

-      style WINDOW_STYLE_FILLED

-      rect 532 395 92 26

-      textalign 1

-      textalignx 46   // center

-      textaligny 22

-      backcolor 0 0 0 1

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        open findplayer_popmenu

-      }

-    }

-    

-

-

-    itemDef

-    {

-      name createServer

-      text "Create Server"

-      textscale .5

-      style WINDOW_STYLE_EMPTY

-      type ITEM_TYPE_BUTTON

-      rect 254 424 128 26

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 32 

-      backcolor .5 .5 .5 .5

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close joinserver;

-        open createserver

-      }        

-    }

-

-

-    // BACK BAR //

-

-    itemDef

-    {

-      name back

-      style 3

-      background "ui/assets/backarrow.tga"

-      rect 16 424 50 50 

-      visible 1 

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close joinserver;

-        open main

-      }

-      

-      mouseEnter

-      {

-        hide back;

-        show back_alt

-      }

-    }

-

-    itemDef

-    {

-      name back_alt

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/backarrow_alt.tga"

-      rect 16 424 50 50

-      backcolor 0 0 0 0

-      forecolor 1 1 1 1

-      visible 0

-      type ITEM_TYPE_BUTTON

-      

-      text "Back"

-      textalign ITEM_ALIGN_LEFT

-      textaligny 36

-      textalignx 60

-      textscale .6

-      

-      mouseExit

-      {

-        hide back_alt;

-        show back

-      }

-      

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close joinserver;

-        open main

-      }   

-    }

-

-

-

-

-    itemDef

-    {

-      name accept

-      style 3 

-      rect 574 424 50 50 

-      background "ui/assets/forwardarrow.tga"

-      backcolor 0 0 0 0

-      forecolor 1 1 1 1

-      visible 1 

-      mouseEnter

-      {

-        hide accept;

-        show accept_alt

-      }

-      

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript JoinServer

-      }

-    }

-

-    itemDef

-    {

-      name accept_alt

-      style WINDOW_STYLE_SHADER

-      rect 574 424 50 50

-      background "ui/assets/forwardarrow_alt.tga"

-      backcolor 0 0 0 0

-      type ITEM_TYPE_BUTTON

-      forecolor 1 1 1 1

-      visible 0  

-      type ITEM_TYPE_BUTTON 

-      

-      text "Join"

-      textalign ITEM_ALIGN_LEFT

-      textaligny 36

-      textalignx -55

-      textscale .6

-      

-      mouseExit

-      {

-        hide accept_alt;

-        show accept

-      }

-      

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript JoinServer

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/loading.menu b/tremulous_ui/loading.menu
deleted file mode 100644
index 744fa553..00000000
--- a/tremulous_ui/loading.menu
+++ /dev/null
@@ -1,193 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  assetGlobalDef

-  {

-    cursor "ui/assets/3_cursor3"      // cursor 

-    gradientBar "ui/assets/gradientbar2.tga"  // gradient bar

-    fadeClamp 1.0         // sets the fadeup alpha

-    fadeCycle 1         // how often fade happens in milliseconds

-    fadeAmount 0.1          // amount to adjust alpha per cycle

-

-    shadowX  5          // x amount for shadow offset

-    shadowY  5          // y amount for shadow offset

-    shadowColor 0.1 0.1 0.1 0.25      // shadow color

-

-    font "fonts/font" 26        // font

-    smallFont "fonts/smallfont" 20      // font

-    bigFont "fonts/bigfont" 34      // font

-  }

-

-  menuDef

-  {

-    name "Loading"

-    rect 0 0 640 480

-    fullScreen MENU_TRUE

-

-    itemDef

-    {

-      name background

-      rect 0 0 640 480

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name "levelname"

-      rect 20 20 260 20

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      textscale 0.4

-      textaligny 28

-      textalignx 0

-      ownerdraw CG_LOAD_LEVELNAME

-    }

-

-    itemDef

-    {

-      name "hostname"

-      rect 20 100 260 20

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      textscale 0.4

-      textaligny 28

-      textalignx 0

-      ownerdraw CG_LOAD_HOSTNAME

-    }

-    

-    itemDef

-    {

-      name "motd"

-      rect 20 180 260 20

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      textscale 0.4

-      textaligny 28

-      textalignx 0

-      ownerdraw CG_LOAD_MOTD

-    }

-

-    itemDef

-    {

-      name "levelshot"

-      rect 300 20 320 240

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      ownerdraw CG_LOAD_LEVELSHOT

-    }

-    

-    itemDef

-    {

-      name "media"

-      rect 20 300 380 30

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1 1

-      ownerdraw CG_LOAD_MEDIA

-      align ITEM_ALIGN_CENTER

-      textstyle ITEM_TEXTSTYLE_NEON

-      textscale 0.5

-      special 1.0

-    }

-    

-    itemDef

-    {

-      name "medialabel"

-      style WINDOW_STYLE_EMPTY

-      textscale 0.6

-      rect 420 300 200 40

-      align ITEM_ALIGN_RIGHT

-      textaligny 28

-      textalignx 0

-      forecolor 0.0 0.8 1 1

-      visible 1 

-      decoration 

-      ownerdraw CG_LOAD_MEDIA_LABEL

-    }

-

-    itemDef

-    {

-      name "buildables"

-      rect 20 340 380 30

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1 1

-      ownerdraw CG_LOAD_BUILDABLES

-      align ITEM_ALIGN_CENTER

-      textstyle ITEM_TEXTSTYLE_NEON

-      textscale 0.5

-      special 1.0

-    }

-    

-    itemDef

-    {

-      name "buildableslabel"

-      style WINDOW_STYLE_EMPTY

-      textscale 0.6

-      rect 420 340 200 40

-      align ITEM_ALIGN_RIGHT

-      textaligny 28

-      textalignx 0

-      forecolor 0.0 0.8 1 1

-      visible 1 

-      decoration 

-      ownerdraw CG_LOAD_BUILDABLES_LABEL

-    }

-

-    itemDef

-    {

-      name "charmodel"

-      rect 20 380 380 30

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1 1

-      ownerdraw CG_LOAD_CHARMODEL

-      align ITEM_ALIGN_CENTER

-      textstyle ITEM_TEXTSTYLE_NEON

-      textscale 0.5

-      special 1.0

-    }

-    

-    itemDef

-    {

-      name "charmodellabel"

-      style WINDOW_STYLE_EMPTY

-      textscale 0.6

-      rect 420 380 200 40

-      align ITEM_ALIGN_RIGHT

-      textaligny 28

-      textalignx 0

-      forecolor 0.0 0.8 1 1

-      visible 1 

-      decoration 

-      ownerdraw CG_LOAD_CHARMODEL_LABEL

-    }

-

-    itemDef

-    {

-      name "overall"

-      rect 20 420 600 30

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1 1

-      ownerdraw CG_LOAD_OVERALL

-      align ITEM_ALIGN_CENTER

-      textstyle ITEM_TEXTSTYLE_NEON

-      textscale 0.5

-      special 1.0

-    }

-  }

-}

diff --git a/tremulous_ui/main.menu b/tremulous_ui/main.menu
deleted file mode 100644
index 4103997d..00000000
--- a/tremulous_ui/main.menu
+++ /dev/null
@@ -1,141 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  assetGlobalDef

-  {

-    font "fonts/font" 26        // font

-    smallFont "fonts/smallfont" 20        // font

-    bigFont "fonts/bigfont" 34        // font

-    cursor "ui/assets/3_cursor3"      // cursor 

-    gradientBar "ui/assets/gradientbar2.tga"  // gradient bar

-    itemFocusSound "sound/misc/menu2.wav"   // sound for item getting focus (via keyboard or mouse )

-  

-    fadeClamp 1.0         // sets the fadeup alpha

-    fadeCycle 1         // how often fade happens in milliseconds

-    fadeAmount 0.1          // amount to adjust alpha per cycle

-

-    shadowColor 0.1 0.1 0.1 0.25      // shadow color

-  }

-                 

-

-

-

-

-  menuDef

-  {

-    name main

-    fullScreen MENU_TRUE        

-    rect 0 0 640 480        // Size and position of the menu

-    visible MENU_TRUE       // Visible on open

-    focusColor 1 .75 0 1        // Menu focus color for text and items

-

-    onOpen { uiScript stopRefresh ; playlooped "sound/ui/heartbeat.wav" }	

-    onESC { open quit_popmenu }

-  

-    itemDef

-    {

-      name background

-      rect 0 0 640 480

-      style WINDOW_STYLE_SHADER

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-      background "ui/assets/mainmenu.jpg"

-    }

-

-    itemDef

-    {

-      name splashmodel

-      rect 0 0 640 480

-      type ITEM_TYPE_MODEL

-      style WINDOW_STYLE_EMPTY

-      asset_model "models/splash/splash_screen.md3"

-      model_fovx 32.0

-      model_fovy 24.0

-      model_angle 180

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name mainmenu

-      text "Play"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      textstyle ITEM_TEXTSTYLE_NORMAL 

-      rect 472 20 128 20 

-      textalign ITEM_ALIGN_RIGHT

-      textalignx 128 

-      textaligny 20 

-      textscale .416

-      forecolor 1 1 1 1 

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close main; 

-        open joinserver

-      }

-    }

-

-    itemDef

-    {

-      name mainmenu

-      text "Mods"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY 

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      textscale .416

-      rect 472 40 128 20 

-      textalignx 128 

-      textaligny 20 

-      textalign ITEM_ALIGN_RIGHT   

-      backcolor 0 0 0 0

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        open mod

-      }

-    }

-

-    itemDef

-    {

-      name mainmenu

-      text "Quit"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      rect 472 60 128 20

-      textalignx 128 

-      textaligny 20 

-      textscale .416

-      textalign ITEM_ALIGN_RIGHT   

-      forecolor 1 1 1 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav";

-        open quit_popmenu

-      }

-    }

-

-    itemDef

-    {

-      name copyright

-      text "Tremulous (C) 2005 darklegion development"

-      style WINDOW_STYLE_EMPTY

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      textscale .25

-      rect 0 440 640 40

-      textalign 1 

-      textaligny 32

-      textalignx 320 

-      forecolor .75 .75 .75 .75

-      visible 1 

-      decoration 

-    }

-  }

-}

diff --git a/tremulous_ui/menus.txt b/tremulous_ui/menus.txt
deleted file mode 100644
index cdd0721c..00000000
--- a/tremulous_ui/menus.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// menu defs

-// 

-{ 

-  loadMenu { "ui/main.menu" }

-  loadMenu { "ui/joinserver.menu" }

-  loadMenu { "ui/punkbuster.menu" }

-  loadMenu { "ui/createserver.menu" }

-  loadMenu { "ui/mod.menu" }

-  loadMenu { "ui/credit.menu" }

-  loadMenu { "ui/connect.menu" }

-  loadMenu { "ui/password.menu" }

-  loadMenu { "ui/quit.menu" }

-  loadMenu { "ui/addfilter.menu" }

-  loadMenu { "ui/error.menu" }

-  loadMenu { "ui/serverinfo.menu" }

-  loadMenu { "ui/findplayer.menu" }

-  loadMenu { "ui/quitcredit.menu" }

-  loadMenu { "ui/createfavorite.menu" }

-}

diff --git a/tremulous_ui/mod.menu b/tremulous_ui/mod.menu
deleted file mode 100644
index 51c62314..00000000
--- a/tremulous_ui/mod.menu
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ MOD \\

-

-  menuDef

-  {

-    name "mod"

-    visible 0

-    fullscreen 0

-    rect 160 120 320 240

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onEsc

-    {

-      close mod;

-      open main

-    }

-    onOpen

-    {

-      uiScript loadMods

-    }

-

-    itemDef

-    {

-      name window

-      rect 0 0 320 240

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name modlist

-      rect 10 10 300 200

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_MODS

-      textalign 3

-      textaligny 14

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleClick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript RunMod

-      }

-    }

-

-    itemDef

-    {

-      name ok

-      text "OK"

-      type 1

-      textscale .25

-      rect 250 210 30 26

-      textalign 1

-      textalignx 15

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      action

-      { 

-        play "sound/misc/menu1.wav";

-        close mod;

-        uiScript RunMod

-      }

-    }

-    

-    itemDef

-    {

-      name cancel

-      text "Cancel"

-      type 1

-      textscale .25

-      rect 280 210 30 26

-      textalign 1

-      textalignx 15

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      action

-      { 

-        play "sound/misc/menu3.wav";

-        close mod;

-        open main

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/password.menu b/tremulous_ui/password.menu
deleted file mode 100644
index e4b8b3ec..00000000
--- a/tremulous_ui/password.menu
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ PASSWORD POPUP MENU \\

-

-  menuDef

-  {

-    name "password_popmenu"

-    visible 0

-    fullscreen 0

-    rect 204 122 235 235

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onESC

-    {

-      close password_popmenu;

-      open joinserver

-    }

-    

-    itemDef

-    {

-      name window

-      rect 47 47 144 144

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    // PASSWORD	//

-

-    itemDef

-    {

-      name password

-      text "Password"

-      style 0

-      decoration

-      textscale .3

-      rect 0 86 110 20

-      textalign 1

-      textalignx 117

-      textaligny 16

-      forecolor 1 1 1 1

-      visible 1

-    }

-    

-    itemDef

-    {

-      name passwordEntry

-      style 1

-      text ""

-      maxchars 15

-      textscale .25

-      TYPE 4

-      cvar "password" 

-      rect 60 106 120 20

-      textalign ITEM_ALIGN_LEFT

-      textalignx 10

-      textaligny 16

-      forecolor 1 1 1 1

-      backcolor .2 .2 .2 .5

-      visible 1

-    }

-

-    itemDef

-    {

-      name yes

-      text "OK"

-      type 1

-      textscale .25

-      style WINDOW_STYLE_EMPTY

-      rect 103 140 30 26

-      textalign 1

-      textalignx 15

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav";

-        close password_popmenu;

-        open joinserver

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/ptrc.menu b/tremulous_ui/ptrc.menu
deleted file mode 100644
index d40e1972..00000000
--- a/tremulous_ui/ptrc.menu
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  // PTRC POPUP MENU //

-

-  menuDef

-  {

-    name "ptrc_popmenu"

-    visible 0

-    fullscreen 0

-    rect 140 170 360 140

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onESC

-    {

-      play "sound/misc/menu1.wav"; 

-      close ptrc_popmenu

-    }

-

-    

-    itemDef

-    {

-      name window

-      rect 0 0 360 140

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-

-    // PTRC //

-

-    itemDef

-    {

-      name confirm

-      text "It seems that you disconnected during this game."

-      style 0

-      textscale .4 

-      textstyle 3

-      rect 180 40 0 0

-      textalign ITEM_ALIGN_CENTER

-      decoration

-      forecolor 1 1 1 1

-      visible 1

-    }

-

-    itemDef

-    {

-      name confirm

-      text "Would you like to be restored to your previous state?"

-      style 0

-      textscale .4 

-      textstyle 3

-      rect 180 65 0 0

-      textalign ITEM_ALIGN_CENTER

-      decoration

-      forecolor 1 1 1 1

-      visible 1

-    }

-

-

-    itemDef

-    {

-      name yes

-      text "YES"

-      type 1

-      textscale .25

-      rect 80 96 20 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 10

-      textaligny 14

-      forecolor 1 1 1 1

-      visible 1

-      action

-      { 

-        play "sound/misc/menu4.wav"; 

-        uiScript PTRCRestore;

-        close ptrc_popmenu 

-      }

-    }

-    

-

-    itemDef

-    {

-      name no

-      text "NO"

-      type 1

-      textscale .25

-      rect 260 96 20 20

-      textalign ITEM_ALIGN_CENTER

-      textalignx 10

-      textaligny 14

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close ptrc_popmenu

-      }

-    }

-  }

-}

-

-

diff --git a/tremulous_ui/punkbuster.menu b/tremulous_ui/punkbuster.menu
deleted file mode 100644
index acd36949..00000000
--- a/tremulous_ui/punkbuster.menu
+++ /dev/null
@@ -1,292 +0,0 @@
-#include "ui/menudef.h"
-
-{
-
-  // PB enable ----------------
-
-  menuDef
-  {
-    name "pbenable_popmenu"
-    visible 0
-    fullscreen 0
-    rect 204 122 235 235
-    focusColor 1 .75 0 1
-    style 1
-    border 1
-    popup
-    onESC
-    {
-      close pbenable_popmenu;
-      open joinserver
-    }
-
-    itemDef
-    {
-      name window
-      rect 47 47 144 144
-      style WINDOW_STYLE_FILLED
-      backcolor 0 0 0 1
-      visible 1
-      decoration
-
-      border WINDOW_BORDER_FULL
-      borderSize 1.0
-      borderColor 0.5 0.5 0.5 1
-    }
-
-    itemDef
-    {
-      name confirm
-      text "Enable Punkbuster?"
-      style 0
-      textscale .25 
-      textstyle 3
-      rect 0 85 110 20
-      textalign 1
-      textalignx 120
-      textaligny 15
-      decoration
-      forecolor 1 1 1 1
-      visible 1
-    }
-
-    // yes/no button
-
-    itemDef
-    {
-      name yes
-      text "YES"
-      type 1
-      textscale .25
-      rect 75 140 30 26
-      textalign 1
-      textalignx 18
-      textaligny 20
-      forecolor 1 1 1 1
-      visible 1
-      action
-      {
-        play "sound/misc/menu1.wav"; 
-        uiScript setPbClStatus 1;
-        close pbenable_popmenu; 
-        open joinserver
-      }
-    }
-
-    itemDef
-    {
-      name no
-      text "NO"
-      type 1
-      textscale .25
-      rect 128 140 30 26
-      textalign 1
-      textalignx 18
-      textaligny 20
-      forecolor 1 1 1 1
-      visible 1
-      action
-      {
-        play "sound/misc/menu4.wav"; 
-        close pbenable_popmenu;
-        open joinserver
-      }
-    }
-  }
-
-  // PB disable ---------------
-
-  menuDef
-  {
-    name "pbdisable_popmenu"
-    visible 0
-    fullscreen 0
-    rect 204 122 235 235
-    focusColor 1 .75 0 1
-    style 1
-    border 1
-    popup
-    onESC
-    {
-      close pbdisable_popmenu;
-      open joinserver
-    }
-
-    itemDef
-    {
-      name window
-      rect 47 47 144 144
-      style WINDOW_STYLE_FILLED
-      backcolor 0 0 0 1
-      visible 1
-      decoration
-
-      border WINDOW_BORDER_FULL
-      borderSize 1.0
-      borderColor 0.5 0.5 0.5 1
-    }
-
-    itemDef
-    {
-      name confirm
-      text "Disable Punkbuster?"
-      style 0
-      textscale .25 
-      textstyle 3
-      rect 0 85 110 20
-      textalign 1
-      textalignx 120
-      textaligny 15
-      decoration
-      forecolor 1 1 1 1
-      visible 1
-    }
-
-    // yes/no button
-
-    itemDef
-    {
-      name yes
-      text "YES"
-      type 1
-      textscale .25
-      rect 75 140 30 26
-      textalign 1
-      textalignx 18
-      textaligny 20
-      forecolor 1 1 1 1
-      visible 1
-      action
-      {
-        play "sound/misc/menu1.wav"; 
-        close pbdisable_popmenu; 
-        open pbmsg_popmenu
-      }
-    }
-
-    itemDef
-    {
-      name no
-      text "NO"
-      type 1
-      textscale .25
-      rect 128 140 30 26
-      textalign 1
-      textalignx 18
-      textaligny 20
-      forecolor 1 1 1 1
-      visible 1
-      action
-      {
-        play "sound/misc/menu4.wav"; 
-        close pbdisable_popmenu;
-        open joinserver
-      }
-    }
-  }
-
-  // disable msg --------------
-
-  menuDef
-  {
-    name "pbmsg_popmenu"
-    visible 0
-    fullscreen 0
-    rect 204 122 235 235
-    focusColor 1 .75 0 1
-    style 1
-    border 1
-    popup
-    onESC
-    {
-      play "sound/misc/menu4.wav"; 
-      close pbmsg_popmenu;
-      open joinserver
-    }
-
-    itemDef
-    {
-      name window
-      rect 47 47 144 144
-      style WINDOW_STYLE_FILLED
-      backcolor 0 0 0 1
-      visible 1
-      decoration
-
-      border WINDOW_BORDER_FULL
-      borderSize 1.0
-      borderColor 0.5 0.5 0.5 1
-    }
-
-    itemDef
-    {
-      name confirm
-      text "PunkBuster will be disabled"
-      style 0
-      textscale .25 
-      textstyle 3
-      rect 0 85 110 20
-      textalign 1
-      textalignx 120
-      textaligny 15
-      decoration
-      forecolor 1 1 1 1
-      visible 1
-    }
-    
-    itemDef
-    {
-      name confirm
-      text "next time you start"
-      style 0
-      textscale .25 
-      textstyle 3
-      rect 0 100 110 20
-      textalign 1
-      textalignx 120
-      textaligny 15
-      decoration
-      forecolor 1 1 1 1
-      visible 1
-    }
-    
-    itemDef
-    {
-      name confirm
-      text "Tremulous" 
-      style 0
-      textscale .25 
-      textstyle 3
-      rect 0 115 110 20
-      textalign 1
-      textalignx 120
-      textaligny 15
-      decoration
-      forecolor 1 1 1 1
-      visible 1
-    }
-
-    // ok button
-
-    itemDef
-    {
-      name yes
-      text "OK"
-      type 1
-      textscale .25
-      rect 103 158 30 26
-      textalign 1
-      textalignx 18
-      textaligny 20
-      forecolor 1 1 1 1
-      visible 1
-      action
-      {
-        play "sound/misc/menu1.wav"; 
-        uiScript setPbClStatus 0;
-        close pbmsg_popmenu; 
-        open joinserver
-      }
-    }
-  }
-}
diff --git a/tremulous_ui/quit.menu b/tremulous_ui/quit.menu
deleted file mode 100644
index dede2585..00000000
--- a/tremulous_ui/quit.menu
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ QUIT POPUP MENU \\

-

-  menuDef

-  {

-    name "quit_popmenu"

-    visible 0

-    fullscreen 0

-    rect 204 122 235 235

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onESC

-    {

-      play "sound/misc/menu1.wav"; 

-      close quit_popmenu;

-      open main

-    }

-

-    

-    itemDef

-    {

-      name window

-      rect 47 47 144 144

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-

-    // QUIT //

-

-    itemDef

-    {

-      name confirm

-      text "Quit Tremulous?"

-      style 0

-      textscale .3 

-      textstyle 3

-      rect 0 90 110 20

-      textalign 1

-      textalignx 117

-      textaligny 16

-      decoration

-      forecolor 1 1 1 1

-      visible 1

-    }

-

-

-    itemDef

-    {

-      name yes

-      text "YES"

-      type 1

-      textscale .25

-      rect 75 120 30 26

-      textalign 1

-      textalignx 15

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      action

-      { 

-        play "sound/misc/menu4.wav"; 

-        close main;

-        close quit_popmenu; 

-        open quitCredit

-      }

-    }

-    

-

-    itemDef

-    {

-      name no

-      text "NO"

-      type 1

-      textscale .25

-      rect 128 120 30 26

-      textalign 1

-      textalignx 15

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close quit_popmenu;

-        open main

-      }

-    }

-  }

-}

-

-

diff --git a/tremulous_ui/quitcredit.menu b/tremulous_ui/quitcredit.menu
deleted file mode 100644
index 390daa60..00000000
--- a/tremulous_ui/quitcredit.menu
+++ /dev/null
@@ -1,431 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ QUIT CREDIT \\

-

-  menuDef

-  {

-    name "quitCredit"

-    visible 0

-    fullscreen 1

-    rect 0 0 640 480

-    focusColor 1 .75 0 1

-    style 1

-    border 0

-    onEsc

-    {

-      uiScript "quit"

-    }

-

-    itemDef

-    {

-      name exitclickbox

-      style WINDOW_STYLE_SHADER

-      rect 0 0 640 480

-      type ITEM_TYPE_BUTTON

-      visible 1

-      backcolor 0 0 0 1

-      background "ui/assets/credits_splash.jpg"

-      action

-      {

-        play "sound/misc/nomenu.wav";

-        close quitCredit;

-        uiScript "quit"

-      }

-    }

-    

-    itemDef

-    {

-      name topstripe

-      style WINDOW_STYLE_FILLED

-      rect -5 -5 645 64

-      visible 1

-      backcolor 0 0 0 1

-      

-      border WINDOW_BORDER_FULL

-      borderSize 1.5

-      borderColor 1 0 0 1

-    }

-

-    itemDef

-    {

-      name bottomstripe

-      style WINDOW_STYLE_FILLED

-      rect -5 416 645 485

-      visible 1

-      backcolor 0 0 0 1

-      

-      border WINDOW_BORDER_FULL

-      borderSize 1.5

-      borderColor 1 0 0 1

-    }

-

-    itemDef

-    {

-      name        "creditstitle"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        320 48 1 1

-      textalign   ITEM_ALIGN_CENTER

-      textalignx  0

-      textaligny  0

-      textscale   0.75

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "CREDITS"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    

-    itemDef

-    {

-      name        "credit1left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 96 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Tim 'Timbo' Angus"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit1right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 96 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Programming and Direction"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit2left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 128 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Nick 'jex' Jansens"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit2right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 128 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Mapping, texturing and 2D artwork"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit3left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 160 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Robin 'OverFlow' Marshall"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit3right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 160 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Modelling, animation and mapping"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit4left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 192 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Jan 'Stannum' van der Weg"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit4right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 192 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Texturing and mapping"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit5left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 224 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Mike 'Veda' McInnerney"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit5right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 224 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Modelling, animation and texturing"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit6left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 256 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Gordon 'Godmil' Miller"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit6right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 256 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Mapping"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit7left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 288 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "'Who-[Soup]'"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit7right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 288 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Mapping"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit8left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 320 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Tristan 'jhrx' Blease"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit8right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 320 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Mapping"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-

-    itemDef

-    {

-      name        "credit9left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 352 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Paul 'MoP' Greveson"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit9right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 352 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Modelling and texturing"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-    

-    itemDef

-    {

-      name        "credit10left"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        10 384 1 1

-      textalign   ITEM_ALIGN_LEFT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Chris 'Dolby' McCarthy"

-      forecolor   1 1 1 1

-      backcolor   1 0 0 1

-      visible     1

-      decoration 

-    }

-    itemDef

-    {

-      name        "credit10right"

-      group       grpidcredit

-      style       WINDOW_STYLE_EMPTY

-      rect        630 384 1 1

-      textalign   ITEM_ALIGN_RIGHT

-      textalignx  0

-      textaligny  10

-      textscale   0.50

-      textstyle   ITEM_TEXTSTYLE_NORMAL

-      text        "Sound"

-      forecolor   1 1 1 1

-      backcolor   0 1 0 1

-      visible     1

-      decoration 

-    }

-  }

-}

diff --git a/tremulous_ui/serverinfo.menu b/tremulous_ui/serverinfo.menu
deleted file mode 100644
index 2282c888..00000000
--- a/tremulous_ui/serverinfo.menu
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ SERVER INFO POPUP MENU \\

-

-  menuDef

-  {

-    name "serverinfo_popmenu"

-    visible 0

-    fullscreen 0

-    rect 158 80 320 340

-    focusColor 1 .75 0 1

-    style 1

-    border 1

-    popup

-    onClose { }

-    onOpen { uiScript ServerStatus }

-    onESC

-    {

-      close serverinfo_popmenu;

-      open joinserver

-    }

-

-    itemDef

-    {

-      name window

-      rect 10 15 300 320

-      style 1

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name serverinfo

-      rect 0 20 320 20  

-      text "Server Information" 

-      textstyle 3

-      textalign 1

-      textscale .333

-      textalignx 160

-      textaligny 20

-      forecolor 1 1 1 1

-      visible 1

-      decoration

-    }

-

-

-    itemDef

-    {

-      name serverinfo

-      rect 20 55 280 230

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_FILLED

-      elementwidth 120

-      elementheight 16

-      textscale .225

-      backcolor 0 0 0 1

-      border 1

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_SERVERSTATUS

-      notselectable

-      visible 1

-      columns 4

-        2   40  20  ITEM_ALIGN_LEFT

-        40  40  10  ITEM_ALIGN_LEFT

-        90  40  10  ITEM_ALIGN_LEFT

-        135 40  20  ITEM_ALIGN_LEFT

-    }

-

-    itemDef

-    {

-      name window

-      rect 20 55 264 230

-      style 1

-      backcolor 0 0 0 0

-      forecolor 0 0 0 0

-      border 1

-      bordersize 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-    //  BUTTON  //

-

-    itemDef

-    {

-      name exit

-      text "Exit"

-      type 1

-      textscale .23

-      group grpControlbutton

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 95 295 45 26

-      textalign 1

-      textalignx 23

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close serverinfo_popmenu; 

-        open joinserver

-      }

-    }

-

-    itemDef

-    {

-      name refresh

-      text "Refresh"

-      type 1

-      textscale .23

-      group grpControlbutton

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 180 295 45 26

-      textalign 1

-      textalignx 23

-      textaligny 20

-      forecolor 1 1 1 1

-      backcolor .37 .1 .1 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript ServerStatus

-      }

-    }

-  }

-}

-

-

diff --git a/tremulous_ui/teamscore.menu b/tremulous_ui/teamscore.menu
deleted file mode 100644
index 9d98fe45..00000000
--- a/tremulous_ui/teamscore.menu
+++ /dev/null
@@ -1,286 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  \\ score_menu \\

-

-  menuDef

-  {

-    name "teamscore_menu"

-    visible 0

-    fullscreen 0

-    rect 0 0 640 480

-    focusColor 1 .75 0 1

-    style 0

-    border 1

-

-

-    // GAMETYPE BAR	//

-

-    //	TEAM NAME	//

-

-    itemDef

-    {

-      name teamNameWindow

-      rect 14 78 612 30 

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      forecolor 1 1 1 1

-      backcolor 0 0 0 .5

-      visible 1

-      decoration

-    }

-  

-    itemDef

-    {

-      name alienteamname

-      text "Aliens"

-      textalign ITEM_ALIGN_LEFT

-      textscale .5

-      textaligny 26

-      rect 20 78 306 23

-      forecolor 1 1 1 1	 

-      decoration

-      visible 1 	  

-    }

-

-    itemDef

-    {

-      name stagereport

-      align ITEM_ALIGN_CENTER

-      textscale 0.4

-      textaligny 24

-      rect 14 78 612 23

-      forecolor 1 1 1 1	 

-      decoration

-      visible 1

-      ownerdraw CG_STAGE_REPORT_TEXT

-    }

-

-    itemDef

-    {

-      name humanteamname

-      text "Humans"

-      textalign ITEM_ALIGN_RIGHT

-      textscale .5

-      textaligny 26

-      rect 620 78 0 23		 

-      forecolor 1 1 1 1

-      decoration

-      visible 1 	  

-    }

-

-    //	TEAM BARS	//

-	

-    itemDef

-    {

-      name leftteambar

-      rect 14 112 307 25	

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      forecolor 1 1 1 1

-      backcolor 0 0 0 .5

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name rightteambar

-      rect 320 112 306 25	

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      forecolor 1 1 1 1

-      backcolor 0 0 0 .5

-      visible 1

-      decoration

-    }

-

-

-    //	TEAM HEADINGS	//

-

-    itemDef

-    {

-      name leftteamheadings

-      text "Status     Name                                        Kills       Time        Ping"

-      textscale .25

-      style 0	

-      rect 25 112 128 30 

-      textalign 0		

-      textalignx 0		// x alignment point for text

-        // use it to offset left/right text from the edge 

-                // or to center the text on a different point

-      textaligny 18        

-      backcolor 0 0 0 0

-      forecolor 1 .75 0 1

-      decoration

-      visible 1 	  

-    }

-    

-    itemDef

-    {

-      name rightteamheadings

-      text "Status     Name                                        Kills       Time        Ping"

-      textscale .25

-      style 0	

-      rect 331 112 128 30 

-      textalign 0		

-      textalignx 0		// x alignment point for text

-        // use it to offset left/right text from the edge 

-                // or to center the text on a different point

-      textaligny 18        

-      backcolor 0 0 0 0

-      forecolor 1 .75 0 1

-      decoration

-      visible 1 	  

-    }

-

-

-    // GRADIENT BACKGROUNDS	//

-

-    itemDef

-    {

-      name window

-      rect 320 142 1 220	

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      forecolor 1 1 1 1

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      rect 300 142 1 220	

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      rect 606 142 1 220	

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      visible 1

-      decoration

-    }

-

-

-    //	LIST	//

-

-    itemDef

-    {

-      name leftlist

-      rect 14 142 306 222 

-      forecolor .75 .75 .75 1

-      visible 1 

-      type ITEM_TYPE_LISTBOX

-      elementwidth 135

-      elementheight 20

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_ALIENTEAM_LIST

-      notselectable

-      columns 7

-        5   15  1   ITEM_ALIGN_LEFT

-        21  15  1   ITEM_ALIGN_LEFT

-        7   30  5   ITEM_ALIGN_LEFT

-        45  100 24  ITEM_ALIGN_LEFT

-        172 20  4   ITEM_ALIGN_RIGHT

-        209 20  4   ITEM_ALIGN_RIGHT

-        247 20  4   ITEM_ALIGN_RIGHT

-    }

-

-    itemDef 

-    {

-      name rightlist

-      rect 320 142 306 222 	 	     

-      forecolor 1 1 1 1

-      visible 1 

-      type ITEM_TYPE_LISTBOX

-      elementwidth 135

-      elementheight 20

-      textscale .25

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_HUMANTEAM_LIST

-      notselectable

-      columns 7

-        5   15  1   ITEM_ALIGN_LEFT

-        21  15  1   ITEM_ALIGN_LEFT

-        7   30  5   ITEM_ALIGN_LEFT

-        45  100 24  ITEM_ALIGN_LEFT

-        172 20  4   ITEM_ALIGN_RIGHT

-        209 20  4   ITEM_ALIGN_RIGHT

-        247 20  4   ITEM_ALIGN_RIGHT

-    }

-

-

-    //	PLAYER LIST BORDER	//

-

-    itemDef

-    {

-      name window

-      rect 14 141 612 221	

-      style WINDOW_STYLE_EMPTY

-      border 1

-      bordercolor .5 .5 .5 1

-      forecolor 1 1 1 1

-      backcolor 0 0 0 .5

-      visible 1

-      decoration

-    }

-

-

-    //	spectators	//

-

-    itemDef

-    {

-      name window

-      rect 14 366 612 24	

-      style WINDOW_STYLE_FILLED

-      border 1

-      bordercolor .5 .5 .5 1

-      forecolor 1 1 1 .7

-      backcolor 0 0 0 .5

-      textscale .33

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      text "Spectating:"

-      textaligny 20 

-      rect 19 366 82 24	

-      style WINDOW_STYLE_FILLED

-      forecolor 1 1 1 1

-      textscale .33

-      textalignx 3

-      visible 1

-      decoration

-    }

-

-    itemDef

-    {

-      name window

-      rect 100 366 520 24	

-      style WINDOW_STYLE_FILLED

-      forecolor 1 1 1 1

-      textscale .33

-      visible 1

-      ownerdraw CG_SPECTATORS

-      decoration

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous.txt b/tremulous_ui/tremulous.txt
deleted file mode 100644
index ca23045a..00000000
--- a/tremulous_ui/tremulous.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// menu defs

-// 

-{ 

-  loadMenu { "ui/tremulous_teamselect.menu" }

-  loadMenu { "ui/tremulous_alienclass.menu" }

-  loadMenu { "ui/tremulous_humanitem.menu" }

-  

-  loadMenu { "ui/tremulous_alienbuild.menu" }

-  loadMenu { "ui/tremulous_humanbuild.menu" }

-  

-  loadMenu { "ui/tremulous_humanarmoury.menu" }

-  

-  loadMenu { "ui/tremulous_humandialogs.menu" }

-  loadMenu { "ui/tremulous_aliendialogs.menu" }

-  

-  loadMenu { "ui/tremulous_alienupgrade.menu" }

-

-  loadMenu { "ui/ptrc.menu" }

-}

diff --git a/tremulous_ui/tremulous_alien_builder_hud.menu b/tremulous_ui/tremulous_alien_builder_hud.menu
deleted file mode 100644
index 8a5b5860..00000000
--- a/tremulous_ui/tremulous_alien_builder_hud.menu
+++ /dev/null
@@ -1,307 +0,0 @@
-#include "ui/menudef.h"

-

-// team menu

-// 

-// defines from ui_shared.h

-

-{

-  menuDef

-  {

-    name "alien_builder_hud"

-    fullScreen MENU_FALSE

-    visible MENU_TRUE

-    rect 0 0 640 480

-

-    //CONSOLE

-    itemDef

-    {

-      name "console"

-      rect 8 8 560 180

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textalignx 0

-      textaligny 18

-      textscale 0.4

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_CONSOLE

-    }   

-

-    //LAGOMETER

-    itemDef

-    {

-      name "lagometer"

-      rect 596 68 32 20

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 0 0 1

-      textscale 0.3

-      textalignx 1

-      textaligny 0.5

-      ownerdraw CG_LAGOMETER

-    }

-

-    //SELECT

-    itemDef

-    {

-      name "select"

-      rect 240 435 160 32

-      visible 0

-      decoration

-      ownerdraw CG_PLAYER_SELECT

-    }

-

-    //////////////////

-    //STATIC OBJECTS//

-    //////////////////

-

-    //LEFT RING CIRCLE

-    itemDef

-    {

-      name "left-ring-circle"

-      rect 47.5 410 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }

-

-    //LEFT ARM

-    itemDef

-    {

-      name "left-arm"

-      rect 77 404.75 104 52.5

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/alien/left-arm.tga"

-    }   

-

-    //LEFT ARM CIRCLE

-    itemDef

-    {

-      name "left-arm-circle"

-      rect 150 417.5 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }   

-

-    //RIGHT RING CIRCLE

-    itemDef

-    {

-      name "right-ring-circle"

-      rect 567 410 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }

-

-    //RIGHT ARM

-    itemDef

-    {

-      name "right-arm"

-      rect 459 404.75 104 52.5

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/alien/right-arm.tga"

-    }   

-

-    ///////////////////

-    //DYNAMIC OBJECTS//

-    ///////////////////

-

-    //BOLT

-    itemDef

-    {

-      name "bolt"

-      rect 52.5 412.5 15 20

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/bolt.tga"

-      ownerdraw CG_PLAYER_BOOST_BOLT

-    }

-

-    //CROSS

-    itemDef

-    {

-      name "cross"

-      rect 155 422.5 15 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/cross.tga"

-    }   

-

-    //LEFT RING

-    itemDef

-    {

-      name "left-ring"

-      rect 7.25 369.5 90.5 106

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/left-ring.tga"

-      ownerdraw CG_PLAYER_BOOSTED

-    }

-

-    //LEFT SPIKES

-    itemDef

-    {

-      name "left-spikes"

-      rect 18.5 381 59 83

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1.0

-      background "ui/assets/alien/left-spikes.tga"

-      ownerdraw CG_PLAYER_WALLCLIMBING

-    }

-

-    //RIGHT RING

-    itemDef

-    {

-      name "right-ring"

-      rect 542.25 369.5 90.5 106

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/right-ring.tga"

-      ownerdraw CG_PLAYER_BOOSTED

-    }

-

-    //RIGHT SPIKES

-    itemDef

-    {

-      name "right-spikes"

-      rect 562.5 381 59 83

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1.0

-      background "ui/assets/alien/right-spikes.tga"

-      ownerdraw CG_PLAYER_WALLCLIMBING

-    }

-

-    //HEALTH

-    itemDef

-    {

-      name "health"

-      rect 78.5 421.5 60 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 .5

-      ownerdraw CG_PLAYER_HEALTH

-    }

-

-    //ALIEN CLASS ICON

-    itemDef

-    {

-      name "alien-icon"

-      rect 465 417.5 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.6

-      ownerdraw CG_PLAYER_WEAPONICON

-    }

-

-    //ORGANS

-    itemDef

-    {

-      name "organs"

-      rect 570.5 415.95 15 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 .5

-      ownerdraw CG_PLAYER_CREDITS_VALUE_NOPAD

-    }

-

-    //BUILD TIMER

-    itemDef

-    {

-      name "buildtimer"

-      rect 567 410 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 .5

-      ownerdraw CG_PLAYER_BUILD_TIMER

-    }

-

-    //BUILD POINTS

-    itemDef

-    {

-      name "build-points"

-      rect 483.5 421.5 60 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 .5

-      ownerdraw CG_PLAYER_AMMO_VALUE

-    }

-

-    //FPS

-    itemDef

-    {

-      name "fps"

-      rect 572 8 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_FPS

-    }

-

-    //TIMER

-    itemDef

-    {

-      name "timer"

-      rect 572 38 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_TIMER

-    }      

-    

-    //ALIENSENSE

-    itemDef

-    {

-      name "aliensense"

-      rect 20 20 600 400

-      visible 1

-      decoration

-      ownerdraw CG_PLAYER_ALIEN_SENSE

-    }

-    

-    //PLAYER NAME

-    itemDef  

-    {  

-      name "playername"  

-      rect 200 275 240 25

-      visible 1  

-      decoration  

-      textScale .5

-      ownerdraw CG_PLAYER_CROSSHAIRNAMES

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_alien_general_hud.menu b/tremulous_ui/tremulous_alien_general_hud.menu
deleted file mode 100644
index 078254fb..00000000
--- a/tremulous_ui/tremulous_alien_general_hud.menu
+++ /dev/null
@@ -1,296 +0,0 @@
-#include "ui/menudef.h"

-

-// team menu

-// 

-// defines from ui_shared.h

-

-{

-  menuDef

-  {

-    name "alien_general_hud"

-    fullScreen MENU_FALSE

-    visible MENU_TRUE

-    rect 0 0 640 480

-

-    //CONSOLE

-    itemDef

-    {

-      name "console"

-      rect 8 8 560 180

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textalignx 0

-      textaligny 18

-      textscale 0.4

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_CONSOLE

-    }   

-

-    //LAGOMETER

-    itemDef

-    {

-      name "lagometer"

-      rect 596 68 32 20

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 0 0 1

-      textscale 0.3

-      textalignx 1

-      textaligny 0.5

-      ownerdraw CG_LAGOMETER

-    }

-

-    //SELECT

-    itemDef

-    {

-      name "select"

-      rect 240 435 160 32

-      visible 0

-      decoration

-      ownerdraw CG_PLAYER_SELECT

-    }

-

-    //////////////////

-    //STATIC OBJECTS//

-    //////////////////

-

-    //LEFT RING CIRCLE

-    itemDef

-    {

-      name "left-ring-circle"

-      rect 47.5 410 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }

-

-    //LEFT ARM

-    itemDef

-    {

-      name "left-arm"

-      rect 77 404.75 104 52.5

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/alien/left-arm.tga"

-    }   

-

-    //LEFT ARM CIRCLE

-    itemDef

-    {

-      name "left-arm-circle"

-      rect 150 417.5 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }   

-

-    //RIGHT RING CIRCLE

-    itemDef

-    {

-      name "right-ring-circle"

-      rect 567 410 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }

-

-    //RIGHT ARM

-    itemDef

-    {

-      name "right-arm"

-      rect 459 404.75 104 52.5

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/alien/right-arm.tga"

-    }   

-

-    ///////////////////

-    //DYNAMIC OBJECTS//

-    ///////////////////

-

-    //BLOB

-    itemDef

-    {

-      name "blob"

-      rect 479 419 57 18

-      visible 1

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/tremublob.tga"

-      ownerdraw CG_PLAYER_POISON_BARBS

-    }

-

-    //BOLT

-    itemDef

-    {

-      name "bolt"

-      rect 52.5 412.5 15 20

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/bolt.tga"

-      ownerdraw CG_PLAYER_BOOST_BOLT

-    }

-

-    //CROSS

-    itemDef

-    {

-      name "cross"

-      rect 155 422.5 15 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/cross.tga"

-    }   

-

-    //LEFT RING

-    itemDef

-    {

-      name "left-ring"

-      rect 7.25 369.5 90.5 106

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/left-ring.tga"

-      ownerdraw CG_PLAYER_BOOSTED

-    }

-

-    //LEFT SPIKES

-    itemDef

-    {

-      name "left-spikes"

-      rect 18.5 381 59 83

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1.0

-      background "ui/assets/alien/left-spikes.tga"

-      ownerdraw CG_PLAYER_WALLCLIMBING

-    }

-

-    //RIGHT RING

-    itemDef

-    {

-      name "right-ring"

-      rect 542.25 369.5 90.5 106

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.5

-      background "ui/assets/alien/right-ring.tga"

-      ownerdraw CG_PLAYER_BOOSTED

-    }

-

-    //RIGHT SPIKES

-    itemDef

-    {

-      name "right-spikes"

-      rect 562.5 381 59 83

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1.0

-      background "ui/assets/alien/right-spikes.tga"

-      ownerdraw CG_PLAYER_WALLCLIMBING

-    }

-

-    //HEALTH

-    itemDef

-    {

-      name "health"

-      rect 78.5 421.5 60 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 .5

-      ownerdraw CG_PLAYER_HEALTH

-    }

-

-    //ALIEN CLASS ICON

-    itemDef

-    {

-      name "alien-icon"

-      rect 465 417.5 25 25

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 0.6

-      ownerdraw CG_PLAYER_WEAPONICON

-    }

-

-    //ORGANS

-    itemDef

-    {

-      name "organs"

-      rect 570.5 415.95 15 15

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 .5

-      ownerdraw CG_PLAYER_CREDITS_VALUE_NOPAD

-    }

-

-    //FPS

-    itemDef

-    {

-      name "fps"

-      rect 572 8 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_FPS

-    }

-

-    //TIMER

-    itemDef

-    {

-      name "timer"

-      rect 572 38 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1.0 0.0 0.0 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_TIMER

-    }      

-    

-    //ALIENSENSE

-    itemDef

-    {

-      name "aliensense"

-      rect 20 20 600 400

-      visible 1

-      decoration

-      ownerdraw CG_PLAYER_ALIEN_SENSE

-    }

-    

-    //PLAYER NAME

-    itemDef  

-    {  

-      name "playername"  

-      rect 200 275 240 25

-      visible 1  

-      decoration  

-      textScale .5

-      ownerdraw CG_PLAYER_CROSSHAIRNAMES

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_alienbuild.menu b/tremulous_ui/tremulous_alienbuild.menu
deleted file mode 100644
index 9676a85f..00000000
--- a/tremulous_ui/tremulous_alienbuild.menu
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_alienbuild"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 112 111 400 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen { uiScript LoadAlienBuilds; setFocus list }

-

-    itemDef

-    {

-      name window

-      rect 0 0 400 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name "list"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMALIENBUILD

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick 

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript BuildAlienBuildable;

-        close tremulous_alienbuild

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_ABUILDINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 305 218 34 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor 0 0 0 1

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript BuildAlienBuildable;

-        close tremulous_alienbuild

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "Cancel"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor 0 0 0 1

-      visible 1 

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        close tremulous_alienbuild

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_alienclass.menu b/tremulous_ui/tremulous_alienclass.menu
deleted file mode 100644
index a3e01c51..00000000
--- a/tremulous_ui/tremulous_alienclass.menu
+++ /dev/null
@@ -1,139 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_alienclass"

-    visible 1

-    fullscreen 0

-    outOfBoundsClick

-    rect 112 111 400 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen { uiScript LoadAlienClasses; setFocus list }

-

-    itemDef

-    {

-      name window

-      rect 0 0 400 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name "list"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMALIENCLASSES

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript SpawnAsAlienClass;

-        close tremulous_alienclass

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_ACLASSINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "Back"

-      text "< Back"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 152 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close tremulous_alienclass;

-        open tremulous_teamselect

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 305 218 34 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript SpawnAsAlienClass;

-        close tremulous_alienclass

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "Cancel"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        close tremulous_alienclass

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_aliendialogs.menu b/tremulous_ui/tremulous_aliendialogs.menu
deleted file mode 100644
index bbea3989..00000000
--- a/tremulous_ui/tremulous_aliendialogs.menu
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_alien_dialog"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 185 140 280 190

-    focusColor 1 .75 0 1

-    style WINDOW_STYLE_EMPTY

-    popup

-

-    itemDef

-    {

-      name window

-      rect 0 0 280 190

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name alien_dialog

-      text "Error"

-      type ITEM_TYPE_TEXT

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 115 10 50 20   

-      textalign ITEM_ALIGN_LEFT

-      textalignx 5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name alien_dialog

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 10 50 250 80   

-      cvar "ui_dialog"

-      autowrapped

-      textalignx 5

-      textaligny 18

-      textscale .33

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name alien_dialog

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 242 150 28 20

-      textalign ITEM_ALIGN_LEFT

-      textalignx 5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close tremulous_alien_dialog

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_alienupgrade.menu b/tremulous_ui/tremulous_alienupgrade.menu
deleted file mode 100644
index 89278d06..00000000
--- a/tremulous_ui/tremulous_alienupgrade.menu
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_alienupgrade"

-    visible 1

-    fullscreen 0

-    outOfBoundsClick

-    rect 112 111 400 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen { uiScript LoadAlienUpgrades; setFocus list }

-

-    itemDef

-    {

-      name window

-      rect 0 0 400 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-

-    itemDef

-    {

-      name "list"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMALIENUPGRADE

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript UpgradeToNewClass;

-        close tremulous_alienupgrade

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_AUPGRADEINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY	

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 305 218 34 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript UpgradeToNewClass;

-        close tremulous_alienupgrade

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "Cancel"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        close tremulous_alienupgrade

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_default_hud.menu b/tremulous_ui/tremulous_default_hud.menu
deleted file mode 100644
index 732c4119..00000000
--- a/tremulous_ui/tremulous_default_hud.menu
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "default_hud"

-    fullScreen MENU_FALSE

-    visible MENU_TRUE

-    rect 0 0 640 480

-    

-    //CONSOLE

-    itemDef

-    {

-      name "console"

-      rect 8 8 560 180

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textalignx 0

-      textaligny 18

-      textscale 0.4

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_CONSOLE

-    }   

-

-    //FPS

-    itemDef

-    {

-      name "fps"

-      rect 572 8 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_FPS

-    }   

-    //TIMER

-    itemDef

-    {

-      name "timer"

-      rect 572 38 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_TIMER

-    }   

-   

-    //SNAPSHOT

-    itemDef

-    {

-      name "snapshot"

-      rect 8 196 200 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.4

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_SNAPSHOT

-    }   

-    //LAGOMETER

-    itemDef

-    {

-      name "lagometer"

-      rect 596 68 32 20

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      textscale 0.3

-      textalignx 1

-      textaligny 0.5

-      ownerdraw CG_LAGOMETER

-    }   

-    

-    //PLAYER NAME

-    itemDef  

-    {  

-      name "playername"  

-      rect 200 275 240 25

-      visible 1  

-      decoration  

-      textScale .5

-      ownerdraw CG_PLAYER_CROSSHAIRNAMES

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_human_hud.menu b/tremulous_ui/tremulous_human_hud.menu
deleted file mode 100644
index 4a67c9cf..00000000
--- a/tremulous_ui/tremulous_human_hud.menu
+++ /dev/null
@@ -1,398 +0,0 @@
-#include "ui/menudef.h"

-

-// team menu

-// 

-// defines from ui_shared.h

-

-{

-  menuDef

-  {

-    name "human_hud"

-    fullScreen MENU_FALSE

-    visible MENU_TRUE

-    rect 0 0 640 480

-

-    //CONSOLE

-    itemDef

-    {

-      name "console"

-      rect 8 8 560 180

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_LEFT

-      textalignx 0

-      textaligny 18

-      textscale 0.4

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_CONSOLE

-    }   

-

-    //LAGOMETER

-    itemDef

-    {

-      name "lagometer"

-      rect 596 68 32 20

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 0 0.8 1 1

-      textscale 0.3

-      textalignx 1

-      textaligny 0.5

-      ownerdraw CG_LAGOMETER

-    }

-

-    //FPS

-    itemDef

-    {

-      name "fps"

-      rect 572 8 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_FPS

-    }   

-    

-    //TIMER

-    itemDef

-    {

-      name "timer"

-      rect 572 38 56 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.3

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_TIMER

-    }   

-

-    //SNAPSHOT

-    itemDef

-    {

-      name "snapshot"

-      rect 8 196 200 22

-      style WINDOW_STYLE_EMPTY

-      visible 1

-      decoration

-      forecolor 1 1 1 1

-      align ITEM_ALIGN_RIGHT

-      textalignx 0

-      textaligny 18

-      textscale 0.4

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      ownerdraw CG_SNAPSHOT

-    }

-

-    //////////////////

-    //STATIC OBJECTS//

-    //////////////////

-

-    //LEFT CIRCLE

-    itemDef

-    {

-      name "left-circle"

-      rect 35 417.5 25 25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }   

-

-    //LEFT ARM

-    itemDef

-    {

-      name "left-arm"

-      rect 68.25 420 94.5 35

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/human/left-arm.tga"

-    }   

-

-    //CREDITS LABEL

-    itemDef

-    {

-      name "credits-label"

-      rect 508 403 7 7.5

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/human/credits.tga"

-    }   

-

-    //RIGHT CIRCLE

-    itemDef

-    {

-      name "right-circle"

-      rect 580 417.5 25 25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/circle.tga"

-    }   

-

-    //RIGHT ARM

-    itemDef

-    {

-      name "right-arm"

-      rect 477.25 420 94.5 35

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/human/right-arm.tga"

-    }   

-

-    //RIGHT CAP

-    itemDef

-    {

-      name "right-cap"

-      rect 500 400 80 15

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/human/right-cap.tga"

-    }   

-

-    ///////////////////

-    //DYNAMIC OBJECTS//

-    ///////////////////

-

-    //BOLT

-    itemDef

-    {

-      name "bolt"

-      rect 40 420 15 20

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/human/bolt.tga"

-      ownerdraw CG_PLAYER_STAMINA_BOLT

-    }   

-

-    //CROSS

-    itemDef

-    {

-      name "cross"

-      rect 137.5 430 15 15

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/neutral/cross.tga"

-      ownerdraw CG_PLAYER_HEALTH_CROSS

-    }   

-

-    //STAMINA 1

-    itemDef

-    {

-      name "stamina1"

-      rect 34.5 403.5 9 11.5

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/human/stamina1.tga"

-      ownerdraw CG_PLAYER_STAMINA_1

-    }   

-

-    //STAMINA 2

-    itemDef

-    {

-      name "stamina2"

-      rect 24 410.75 11.5 10.5

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/human/stamina2.tga"

-      ownerdraw CG_PLAYER_STAMINA_2

-    }   

-

-    //STAMINA 3

-    itemDef

-    {

-      name "stamina3"

-      rect 20.75 423.5 10.5 7

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/human/stamina3.tga"

-      ownerdraw CG_PLAYER_STAMINA_3

-    }   

-

-    //STAMINA 4

-    itemDef

-    {

-      name "stamina4"

-      rect 21 402.5 54 55

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/human/stamina4.tga"

-      ownerdraw CG_PLAYER_STAMINA_4

-    }   

-

-    //RING

-    itemDef

-    {

-      name "ring"

-    //  rect 20 402.5 55 55  // Guide for Stamina alignment

-      rect 565 402.5 55 55

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      background "ui/assets/human/ring.tga"

-      ownerdraw CG_PLAYER_CLIPS_RING

-    }

-

-    //CREDITS

-    itemDef

-    {

-      name "credits"

-      rect 515 402 45 11.25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      ownerdraw CG_PLAYER_CREDITS_VALUE

-    }   

-

-    //HEALTH

-    itemDef

-    {

-      name "health"

-      rect 67 430 60 15

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 .5

-      ownerdraw CG_PLAYER_HEALTH

-    }

-

-    //WEAPON ICON

-    itemDef

-    {

-      name "weapon"

-      rect 482.5 425 25 25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      ownerdraw CG_PLAYER_WEAPONICON

-    }   

-

-    //WEAPON SELECT TEXT  

-    itemDef  

-    {  

-      name "selecttext"  

-      rect 200 300 240 25

-      visible 1  

-      decoration  

-      textScale .5  

-      ownerdraw CG_PLAYER_SELECTTEXT  

-    }

-

-    //AMMO

-    itemDef

-    {

-      name "ammo"

-      rect 494 430 60 15

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 .5

-      ownerdraw CG_PLAYER_AMMO_VALUE

-    }

-

-    //CLIPS

-    itemDef

-    {

-      name "clips"

-      rect 538 423 60 15

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 .5

-      ownerdraw CG_PLAYER_CLIPS_VALUE

-    }

-

-    //BUILD TIMER

-    itemDef

-    {

-      name "buildtimer"

-      rect 580 417.5 25 25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 .5

-      ownerdraw CG_PLAYER_BUILD_TIMER

-    }

-

-    //USABLE

-    itemDef  

-    {  

-      name "usable"

-      rect 307.5 380 25 25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 .5

-      background "ui/assets/neutral/use.tga"

-      ownerdraw CG_PLAYER_USABLE_BUILDABLE

-    }

-

-    //SCANNER

-    itemDef

-    {

-      name "scanner"

-      rect 164 340 312 72

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 .5

-      background "ui/assets/human/scanner.tga"

-      ownerdraw CG_PLAYER_HUMAN_SCANNER

-    }

-

-    //INVENTORY

-    itemDef

-    {

-      name "inventory"

-      rect 232.5 425 175 25

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.5

-      ownerdraw CG_PLAYER_SELECT

-    }

-

-    //SELECTED

-    itemDef

-    {

-      name "selected"

-      rect 306 424 27 27

-      visible 1

-      decoration

-      forecolor 0.0 0.8 1.0 0.25

-      style WINDOW_STYLE_SHADER

-      background "ui/assets/neutral/selected.tga"

-    }   

-    

-    //PLAYER NAME

-    itemDef  

-    {  

-      name "playername"  

-      rect 200 275 240 25

-      visible 1  

-      decoration  

-      textScale .5

-      ownerdraw CG_PLAYER_CROSSHAIRNAMES

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_humanarmoury.menu b/tremulous_ui/tremulous_humanarmoury.menu
deleted file mode 100644
index 53b10037..00000000
--- a/tremulous_ui/tremulous_humanarmoury.menu
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_humanarmoury"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 44 111 544 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen

-    {

-      uiScript LoadHumanArmouryBuys;

-      uiScript LoadHumanArmourySells;

-      setFocus list

-    }

-

-    itemDef

-    {

-      name window

-      rect 0 0 544 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name "buylist"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMHUMANARMOURYBUY

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript BuyFromArmoury

-      }

-    }

-    

-    itemDef

-    {

-      name "selllist"

-      rect 400 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMHUMANARMOURYSELL

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript SellToArmoury

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_HBUYINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "Close"

-      text "Close"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 254 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close tremulous_humanarmoury

-      }

-    }

-    

-    itemDef

-    {

-      name "Buy"

-      text "Buy >"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 152 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript BuyFromArmoury

-      }

-    }

-    

-    itemDef

-    {

-      name "Sell"

-      text "< Sell"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript SellToArmoury

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_humanbuild.menu b/tremulous_ui/tremulous_humanbuild.menu
deleted file mode 100644
index 65a5a0e4..00000000
--- a/tremulous_ui/tremulous_humanbuild.menu
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_humanbuild"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 112 111 400 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen { uiScript LoadHumanBuilds; setFocus list }

-

-    itemDef

-    {

-      name window

-      rect 0 0 400 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name "list"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMHUMANBUILD

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript BuildHumanBuildable;

-        close tremulous_humanbuild

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_HBUILDINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 305 218 34 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript BuildHumanBuildable;

-        close tremulous_humanbuild

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "Cancel"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        close tremulous_humanbuild

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_humandialogs.menu b/tremulous_ui/tremulous_humandialogs.menu
deleted file mode 100644
index 824d2cf0..00000000
--- a/tremulous_ui/tremulous_humandialogs.menu
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_human_dialog"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 185 140 280 190

-    focusColor 1 .75 0 1

-    style WINDOW_STYLE_EMPTY

-    popup

-

-    itemDef

-    {

-      name window

-      rect 0 0 280 190

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name human_dialog

-      text "Error"

-      type ITEM_TYPE_TEXT

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 115 10 50 20   

-      textalign ITEM_ALIGN_LEFT

-      textalignx 5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name human_dialog

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 10 50 250 80   

-      cvar "ui_dialog"

-      autowrapped

-      textalignx 5

-      textaligny 18

-      textscale .33

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name human_dialog

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 242 150 28 20

-      textalign ITEM_ALIGN_LEFT

-      textalignx 5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        close tremulous_human_dialog

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_humanitem.menu b/tremulous_ui/tremulous_humanitem.menu
deleted file mode 100644
index 92e4dd0d..00000000
--- a/tremulous_ui/tremulous_humanitem.menu
+++ /dev/null
@@ -1,139 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_humanitem"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 112 111 400 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen { uiScript LoadHumanItems; setFocus list }

-

-    itemDef

-    {

-      name window

-      rect 0 0 400 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name "list"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMHUMANITEMS

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript SpawnWithHumanItem;

-        close tremulous_humanitem

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_HITEMINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "Back"

-      text "< Back"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 152 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu4.wav"; 

-        close tremulous_humanitem;

-        open tremulous_teamselect

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 305 218 34 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript SpawnWithHumanItem;

-        close tremulous_humanitem

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "Cancel"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        close tremulous_humanitem

-      }

-    }

-  }

-}

diff --git a/tremulous_ui/tremulous_teamselect.menu b/tremulous_ui/tremulous_teamselect.menu
deleted file mode 100644
index 9fb6b6ce..00000000
--- a/tremulous_ui/tremulous_teamselect.menu
+++ /dev/null
@@ -1,117 +0,0 @@
-#include "ui/menudef.h"

-

-{

-  menuDef

-  {

-    name "tremulous_teamselect"

-    visible 0

-    fullscreen 0

-    outOfBoundsClick

-    rect 112 111 400 247

-    focusColor 1 .75 0 1

-    style 1

-    popup

-    onOpen { uiScript LoadTeams; setFocus list }

-

-    itemDef

-    {

-      name window

-      rect 0 0 400 247

-      style WINDOW_STYLE_FILLED

-      backcolor 0 0 0 1

-      visible 1

-      decoration

-

-      border WINDOW_BORDER_FULL

-      borderSize 1.0

-      borderColor 0.5 0.5 0.5 1

-    }

-    

-    itemDef

-    {

-      name "list"

-      rect 8 8 136 231

-      type ITEM_TYPE_LISTBOX

-      style WINDOW_STYLE_EMPTY

-      elementwidth 120

-      elementheight 20

-      textscale .33

-      elementtype LISTBOX_TEXT

-      feeder FEEDER_TREMTEAMS

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1

-      doubleclick

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript JoinTeam;

-        close tremulous_teamselect

-      }

-    }

-    

-    itemDef

-    {

-      name infopane

-      ownerdraw UI_TEAMINFOPANE

-      textstyle ITEM_TEXTSTYLE_NORMAL

-      style WINDOW_STYLE_EMPTY

-      rect 152 8 240 204

-      textscale .33

-      textalignx 6

-      textaligny 12

-      border 1

-      bordercolor   0.5 0.5 0.5 0.5

-      forecolor     1   1   1   1

-      backcolor     0.2 0.2 0.2 1

-      outlinecolor  0.1 0.1 0.1 0.5

-      visible 1 

-      decoration

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "OK"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 305 218 34 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 12.5

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1

-      action

-      {

-        play "sound/misc/menu1.wav"; 

-        uiScript JoinTeam;

-        close tremulous_teamselect

-      }

-    }

-    

-    itemDef

-    {

-      name "OKCancel"

-      text "Cancel"

-      type ITEM_TYPE_BUTTON

-      style WINDOW_STYLE_EMPTY

-      rect 344 218 50 21

-      textalign ITEM_ALIGN_LEFT

-      textalignx 3.8

-      textaligny 18

-      textscale .4

-      forecolor 1 1 1 1

-      backcolor .5 0 0 .25

-      visible 1 

-      action

-      {

-        play "sound/misc/menu3.wav"; 

-        close tremulous_teamselect

-      }

-    }

-  }

-}