From 82a34b02692244390087884e67c2b9a2423f7e54 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Tue, 22 Oct 2002 19:40:50 +0000 Subject: * Punkbuster stuff for 1.32 point release --- ui/createserver.menu | 126 ++++++----------------- ui/joinserver.menu | 115 ++++++++++++++++++--- ui/menus.txt | 1 + ui/punkbuster.menu | 286 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 420 insertions(+), 108 deletions(-) create mode 100644 ui/punkbuster.menu (limited to 'ui') diff --git a/ui/createserver.menu b/ui/createserver.menu index c99cec8d..8f4ddb16 100644 --- a/ui/createserver.menu +++ b/ui/createserver.menu @@ -125,7 +125,7 @@ cvar "sv_hostname" maxChars 32 maxPaintChars 20 - rect 420 30 128 20 + rect 420 20 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 50 128 20 + rect 420 40 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 70 128 20 + rect 420 60 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 90 128 20 + rect 420 80 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -191,7 +191,7 @@ type 4 text "Password:" cvar "g_password" - rect 420 110 128 20 + rect 420 100 128 20 maxchars 10 maxPaintChars 10 textalign ITEM_ALIGN_RIGHT @@ -208,6 +208,23 @@ + 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 + } + itemDef { name normal @@ -215,7 +232,7 @@ type ITEM_TYPE_YESNO text "Pure Server:" cvar "sv_pure" - rect 420 160 128 20 + rect 420 170 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -234,7 +251,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 180 128 20 + rect 420 190 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -250,7 +267,7 @@ type ITEM_TYPE_YESNO text "Auto Download:" cvar "sv_allowdownload" - rect 420 200 128 20 + rect 420 210 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -266,7 +283,7 @@ type ITEM_TYPE_YESNO text "Enable Voting:" cvar "g_allowvote" - rect 420 220 128 20 + rect 420 230 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -288,7 +305,7 @@ type ITEM_TYPE_NUMERICFIELD text "Minimum Ping:" cvar "sv_minping" - rect 420 270 128 20 + rect 420 280 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 maxchars 4 @@ -305,7 +322,7 @@ type ITEM_TYPE_NUMERICFIELD text "Maximum Ping:" cvar "sv_maxping" - rect 420 290 128 20 + rect 420 300 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -322,7 +339,7 @@ type ITEM_TYPE_YESNO text "Synchronous Client:" cvar "g_synchronousclients" - rect 420 310 128 20 + rect 420 320 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -338,7 +355,7 @@ type ITEM_TYPE_NUMERICFIELD text "Max Rate:" cvar "sv_maxrate" - rect 420 330 128 20 + rect 420 340 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 maxchars 4 @@ -355,7 +372,7 @@ type ITEM_TYPE_NUMERICFIELD text "Zombie Time:" cvar "sv_zombietime" - rect 420 350 128 20 + rect 420 360 128 20 maxchars 4 textalign ITEM_ALIGN_RIGHT textalignx 65 @@ -373,7 +390,7 @@ text "Reconnect Limit:" cvar "sv_reconnectlimit" maxchars 4 - rect 420 370 128 20 + rect 420 380 128 20 textalign ITEM_ALIGN_RIGHT textalignx 65 textaligny 12 @@ -386,86 +403,7 @@ -/* itemDef - { - name expert - group grpsettings - type ITEM_TYPE_YESNO - text "Force Join:" - cvar "g_teamautojoin" - rect 420 250 128 12 - 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_YESNO - text "Even Teams:" - cvar "g_teamforcebalance" - rect 420 265 128 12 - 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_YESNO - text "Do Warmup:" - cvar "g_dowarmup" - rect 420 280 128 12 - 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 "Warmup time:" - cvar "g_warmup" - rect 420 295 128 12 - textalign ITEM_ALIGN_RIGHT - textalignx 65 - textaligny 12 - textscale .36 - maxchars 4 - forecolor 1 1 1 1 - visible 1 - }*/ -/* itemDef - { - name normal - group grpsettings - type ITEM_TYPE_YESNO - text "Friendly Fire:" - cvar "g_friendlyfire" - rect 420 94 128 12 - textalign ITEM_ALIGN_RIGHT - textalignx 65 - textaligny 12 - textscale .36 - forecolor 1 1 1 1 - visible 1 - }*/ // BACK BAR // itemDef diff --git a/ui/joinserver.menu b/ui/joinserver.menu index 2700f623..b1e23a66 100644 --- a/ui/joinserver.menu +++ b/ui/joinserver.menu @@ -92,7 +92,7 @@ name gametypefield style WINDOW_STYLE_EMPTY ownerdraw UI_NETSOURCE - rect 46 20 128 26 + rect 26 20 128 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 22 @@ -112,7 +112,7 @@ type ITEM_TYPE_BUTTON textscale .4 style WINDOW_STYLE_EMPTY - rect 200 20 128 26 + rect 190 20 128 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 22 @@ -133,7 +133,7 @@ textscale .4 style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 364 20 128 26 + rect 354 20 128 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 22 @@ -155,7 +155,7 @@ text "View Empty:" cvar "ui_browserShowEmpty" textscale .4 - rect 128 50 128 26 + rect 26 50 128 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 22 @@ -177,7 +177,7 @@ text "View Full:" cvar "ui_browserShowFull" textscale .4 - rect 256 50 128 26 + rect 190 50 128 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 22 @@ -191,6 +191,49 @@ } } + 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 + { + 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 @@ -220,7 +263,7 @@ { name serverColumn group grpColumn - rect 10 130 365 232 + rect 10 130 333 232 style WINDOW_STYLE_FILLED border 1 backcolor 0 0 0 0 @@ -234,7 +277,7 @@ { name mapColumn group grpColumn - rect 375 130 125 232 + rect 343 130 125 232 style WINDOW_STYLE_FILLED border 1 backcolor 0 0 0 0 @@ -248,7 +291,7 @@ { name playerColumn group grpColumn - rect 500 130 60 232 + rect 468 130 60 232 style WINDOW_STYLE_FILLED border 1 backcolor 0 0 0 0 @@ -258,6 +301,20 @@ 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 @@ -289,10 +346,11 @@ backcolor 0.2 0.2 0.2 1 outlinecolor 0.1 0.1 0.1 0.5 visible 1 - columns 4 + columns 5 2 40 40 ITEM_ALIGN_LEFT - 375 40 20 ITEM_ALIGN_LEFT - 500 5 10 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 } @@ -309,7 +367,7 @@ type ITEM_TYPE_BUTTON textscale .33 style WINDOW_STYLE_EMPTY - rect 10 103 365 26 + rect 10 103 333 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 18 @@ -337,7 +395,7 @@ text "Map Name" textscale .33 style WINDOW_STYLE_EMPTY - rect 375 103 125 26 + rect 343 103 125 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 18 @@ -365,7 +423,7 @@ type ITEM_TYPE_BUTTON textscale .33 style WINDOW_STYLE_EMPTY - rect 500 103 60 26 + rect 468 103 60 26 textalign ITEM_ALIGN_LEFT textalignx 10 textaligny 18 @@ -385,6 +443,35 @@ } } + 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/nomenu.wav"; + uiScript ServerSort 5; + + setitemcolor grpColumn backcolor 0 0 0 0; + setitemcolor pbColumn backcolor 0.3 1 1 0.5 + } + } + + itemDef { name Ping diff --git a/ui/menus.txt b/ui/menus.txt index a2210f5c..a76fa910 100644 --- a/ui/menus.txt +++ b/ui/menus.txt @@ -3,6 +3,7 @@ { loadMenu { "ui/main.menu" } loadMenu { "ui/joinserver.menu" } + loadMenu { "ui/punkbuster.menu" } loadMenu { "ui/createserver.menu" } loadMenu { "ui/mod.menu" } loadMenu { "ui/credit.menu" } diff --git a/ui/punkbuster.menu b/ui/punkbuster.menu new file mode 100644 index 00000000..080651e7 --- /dev/null +++ b/ui/punkbuster.menu @@ -0,0 +1,286 @@ +#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 + { + 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 + { + 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 + { + 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 + { + 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 + { + 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 + { + uiScript setPbClStatus 0; + close pbmsg_popmenu; + open joinserver + } + } + } +} -- cgit