From 7199e8ddded777709df090973cab53c040592b72 Mon Sep 17 00:00:00 2001 From: Ben Millwood Date: Sat, 3 Oct 2009 13:15:37 +0000 Subject: * Featured server system - The new master server sends some server records with an additional flag for the client to mark them as featured - they will then appear in a separate list. --- assets/ui/joinserver.menu | 55 +++++++++++++++++++++++++++++++++++++++++++---- assets/ui/menudef.h | 1 + 2 files changed, 52 insertions(+), 4 deletions(-) (limited to 'assets') diff --git a/assets/ui/joinserver.menu b/assets/ui/joinserver.menu index d9cd2f16..c96cc2be 100644 --- a/assets/ui/joinserver.menu +++ b/assets/ui/joinserver.menu @@ -43,6 +43,9 @@ #define LIST_Y ((2*BORDER)+TOP_H) #define LIST_TOFF 5 #define HEADFOOT_H 25 +#define SERVER_H 16 +#define NUM_FEATURED 4 +#define FEATURED_H (SERVER_H*NUM_FEATURED+2) menuDef { @@ -213,7 +216,7 @@ { name server group grpTabs - text "Server Name" + text "Featured Servers" type ITEM_TYPE_BUTTON textscale .33 style WINDOW_STYLE_EMPTY @@ -379,15 +382,59 @@ // SERVER LIST // + itemDef + { + name featuredlist + rect LIST_X (LIST_Y+HEADFOOT_H) LIST_W FEATURED_H + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_EMPTY + elementwidth 120 + elementheight SERVER_H + textscale .25 + elementtype LISTBOX_TEXT + feeder FEEDER_FEATURED + border WINDOW_BORDER_FULL + 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 MENU_TRUE + columns 4 + LIST_TOFF ((SERVER_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT + (LIST_TOFF+((SERVER_C)*LIST_W)) ((MAP_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT + (LIST_TOFF+((SERVER_C+MAP_C)*LIST_W)) ((PLAYERS_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT + (LIST_TOFF+((SERVER_C+MAP_C+PLAYERS_C)*LIST_W)) ((PING_C*LIST_W)-(3*LIST_TOFF)) ALIGN_LEFT + + doubleClick { uiScript JoinServer } + } + + itemDef + { + name featuredseparator + rect LIST_X (LIST_Y+FEATURED_H+HEADFOOT_H) LIST_W HEADFOOT_H + type ITEM_TYPE_TEXT + text "Community Servers" + textalign ALIGN_LEFT + textvalign VALIGN_CENTER + textalignx LIST_TOFF + visible MENU_TRUE + textScale 0.33 + border WINDOW_BORDER_FULL + 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 + } + itemDef { name serverlist - rect LIST_X (LIST_Y+HEADFOOT_H) LIST_W (LIST_H-(2*HEADFOOT_H)) + rect LIST_X (LIST_Y+FEATURED_H+(HEADFOOT_H*2)) LIST_W (LIST_H-(FEATURED_H+(HEADFOOT_H*3))) type ITEM_TYPE_LISTBOX style WINDOW_STYLE_EMPTY elementwidth 120 - elementheight 20 - textscale .33 + elementheight SERVER_H + textscale .25 elementtype LISTBOX_TEXT feeder FEEDER_SERVERS border WINDOW_BORDER_FULL diff --git a/assets/ui/menudef.h b/assets/ui/menudef.h index 80a44e98..41412225 100644 --- a/assets/ui/menudef.h +++ b/assets/ui/menudef.h @@ -87,6 +87,7 @@ enum enum { FEEDER_SERVERS, // servers + FEEDER_FEATURED, // featured servers FEEDER_MAPS, // all maps available, in graphic format FEEDER_ALIENTEAM_LIST, // alien team members FEEDER_HUMANTEAM_LIST, // human team members -- cgit