* Added master server to source, based on dpmaster

* Removed gametype, fraglimit and dmflags cvars
* Removed CD key authentication stuff
* Implemented a means to save and restore cmd context
* Bumped protocol version up to 69 (same as 68)
* Removed various references to punkbuster
* Maps on create server menu now sorted by name
* Fixed some warnings

3 files changed, 24 insertions, 140 deletions

diff --git a/ui/createserver.menu b/ui/createserver.menu
index 1b071270..abd93cee 100644
--- a/ui/createserver.menu
+++ b/ui/createserver.menu
@@ -125,7 +125,7 @@
       cvar "sv_hostname"
       maxChars 32
       maxPaintChars 20
-      rect 420 20 128 20
+      rect 420 30 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -141,7 +141,7 @@
       type ITEM_TYPE_NUMERICFIELD
       text "Time Limit:"
       cvar "timelimit"
-      rect 420 40 128 20
+      rect 420 50 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       maxchars 4
@@ -158,7 +158,7 @@
       type ITEM_TYPE_NUMERICFIELD
       text "Maximum Players:"
       cvar "sv_maxclients"
-      rect 420 60 128 20
+      rect 420 70 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       maxchars 4
@@ -175,7 +175,7 @@
       type ITEM_TYPE_YESNO
       text "Require Password:"
       cvar "g_needpassword"
-      rect 420 80 128 20
+      rect 420 90 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -195,7 +195,7 @@
       type 4
       text "Password:"
       cvar "g_password"
-      rect 420 100 128 20
+      rect 420 110 128 20
       maxchars 10
       maxPaintChars 10
       textalign ITEM_ALIGN_RIGHT
@@ -208,31 +208,6 @@
 
 
 
-
-
-
-
-    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
@@ -240,7 +215,7 @@
       type ITEM_TYPE_YESNO
       text "Pure Server:"
       cvar "sv_pure"
-      rect 420 170 128 20
+      rect 420 160 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -263,7 +238,7 @@
       // 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 
+      rect 420 180 128 20 
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -283,7 +258,7 @@
       type ITEM_TYPE_YESNO
       text "Auto Download:"
       cvar "sv_allowdownload"
-      rect 420 210 128 20
+      rect 420 200 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -303,7 +278,7 @@
       type ITEM_TYPE_YESNO
       text "Enable Voting:"
       cvar "g_allowvote"
-      rect 420 230 128 20
+      rect 420 220 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -318,10 +293,6 @@
 
 
 
-
-
-
-
     itemDef
     {
       name expert
@@ -329,7 +300,7 @@
       type ITEM_TYPE_NUMERICFIELD
       text "Minimum Ping:"
       cvar "sv_minping"
-      rect 420 280 128 20
+      rect 420 270 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       maxchars 4
@@ -346,7 +317,7 @@
       type ITEM_TYPE_NUMERICFIELD
       text "Maximum Ping:"
       cvar "sv_maxping"
-      rect 420 300 128 20
+      rect 420 290 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -363,7 +334,7 @@
       type ITEM_TYPE_YESNO
       text "Synchronous Client:"
       cvar "g_synchronousclients"
-      rect 420 320 128 20
+      rect 420 310 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
@@ -383,7 +354,7 @@
       type ITEM_TYPE_NUMERICFIELD
       text "Max Rate:"
       cvar "sv_maxrate"
-      rect 420 340 128 20 
+      rect 420 330 128 20 
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       maxchars 4
@@ -400,7 +371,7 @@
       type ITEM_TYPE_NUMERICFIELD
       text "Zombie Time:"
       cvar "sv_zombietime"
-      rect 420 360 128 20
+      rect 420 350 128 20
       maxchars 4
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
@@ -418,7 +389,7 @@
       text "Reconnect Limit:"
       cvar "sv_reconnectlimit"
       maxchars 4
-      rect 420 380 128 20
+      rect 420 370 128 20
       textalign ITEM_ALIGN_RIGHT
       textalignx 65
       textaligny 12
diff --git a/ui/joinserver.menu b/ui/joinserver.menu
index 4d6b846b..38ee1b1e 100644
--- a/ui/joinserver.menu
+++ b/ui/joinserver.menu
@@ -194,49 +194,6 @@
       }
     }
 
-    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
 
@@ -267,7 +224,7 @@
     {
       name serverColumn
       group grpColumn
-      rect 10 130 333 232
+      rect 10 130 365 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -281,7 +238,7 @@
     {
       name mapColumn
       group grpColumn
-      rect 343 130 125 232
+      rect 375 130 125 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -295,7 +252,7 @@
     {
       name playerColumn
       group grpColumn
-      rect 468 130 60 232
+      rect 500 130 60 232
       style WINDOW_STYLE_FILLED
       border 1
       backcolor 0 0 0 0
@@ -307,20 +264,6 @@
     
     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
@@ -350,11 +293,10 @@
       backcolor     0.2 0.2 0.2 1
       outlinecolor  0.1 0.1 0.1 0.5
       visible 1
-      columns 5
+      columns 4
         2   40  40  ITEM_ALIGN_LEFT
-        343 40  20  ITEM_ALIGN_LEFT
-        468 5   10  ITEM_ALIGN_LEFT
-        528 5   10  ITEM_ALIGN_LEFT
+        375 40  20  ITEM_ALIGN_LEFT
+        500 5   10  ITEM_ALIGN_LEFT
         560 20  20  ITEM_ALIGN_LEFT
 
       doubleClick { uiScript JoinServer }
@@ -371,7 +313,7 @@
       type ITEM_TYPE_BUTTON
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 10 103 333 26 
+      rect 10 103 365 26 
       textalign ITEM_ALIGN_LEFT
       textalignx 10
       textaligny 18
@@ -399,7 +341,7 @@
       text "Map Name"
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 343 103 125 26
+      rect 375 103 125 26
       textalign ITEM_ALIGN_LEFT
       textalignx 10
       textaligny 18
@@ -427,7 +369,7 @@
       type ITEM_TYPE_BUTTON
       textscale .33
       style WINDOW_STYLE_EMPTY
-      rect 468 103 60 26
+      rect 500 103 60 26
       textalign ITEM_ALIGN_LEFT
       textalignx 10
       textaligny 18
@@ -447,34 +389,6 @@
       }
     }
 
-    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
     {
diff --git a/ui/quitcredit.menu b/ui/quitcredit.menu
index 27568ea1..e3798d0c 100644
--- a/ui/quitcredit.menu
+++ b/ui/quitcredit.menu
@@ -28,7 +28,6 @@
       background "ui/assets/credits_splash.jpg"
       action
       {
-        play "sound/misc/nomenu.wav";
         close quitCredit;
         uiScript "quit"
       }