From 17db07ae8addfb0952875e3af929ca83a08ba481 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Wed, 14 Oct 2009 18:34:07 +0000
Subject: * (bug 4302) Fix server join list - Merge featured / regluar server
list back into one list, with featured sorted to the top and sporting
emoticons to show their distinction - Show a key for the featured server
type icons (Exclamation) * (bug 4303) Disallow (escape) emoticons in server
hostnames
---
assets/ui/joinserver.menu | 73 ++++++++++++++---------------------------------
assets/ui/menudef.h | 1 -
2 files changed, 22 insertions(+), 52 deletions(-)
(limited to 'assets')
diff --git a/assets/ui/joinserver.menu b/assets/ui/joinserver.menu
index c96cc2be..ccadd87e 100644
--- a/assets/ui/joinserver.menu
+++ b/assets/ui/joinserver.menu
@@ -43,9 +43,6 @@
#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
{
@@ -195,6 +192,24 @@
}
}
+ // LEGEND //
+
+ itemDef
+ {
+ name legend
+ type ITEM_TYPE_TEXT
+ text "[official] = Offical Server\n[featured] = Featured Server"
+ style WINDOW_STYLE_EMPTY
+ textstyle ITEM_TEXTSTYLE_NORMAL
+ textscale .25
+ wrapped
+ rect (TOP_X+(2*TOPBUTT_W)) (TOP_Y+TOPBUTT_H) (TOPBUTT_W) (TOPBUTT_H)
+ textalign ALIGN_LEFT
+ textvalign VALIGN_CENTER
+ forecolor 1 1 1 1
+ visible MENU_TRUE
+ decoration
+ }
// MAP PREVIEW //
@@ -216,7 +231,7 @@
{
name server
group grpTabs
- text "Featured Servers"
+ text "Server Name"
type ITEM_TYPE_BUTTON
textscale .33
style WINDOW_STYLE_EMPTY
@@ -382,59 +397,15 @@
// 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+FEATURED_H+(HEADFOOT_H*2)) LIST_W (LIST_H-(FEATURED_H+(HEADFOOT_H*3)))
+ rect LIST_X (LIST_Y+HEADFOOT_H) LIST_W (LIST_H-(2*HEADFOOT_H))
type ITEM_TYPE_LISTBOX
style WINDOW_STYLE_EMPTY
elementwidth 120
- elementheight SERVER_H
- textscale .25
+ elementheight 20
+ textscale .33
elementtype LISTBOX_TEXT
feeder FEEDER_SERVERS
border WINDOW_BORDER_FULL
diff --git a/assets/ui/menudef.h b/assets/ui/menudef.h
index 0ec235ab..f87fc34e 100644
--- a/assets/ui/menudef.h
+++ b/assets/ui/menudef.h
@@ -87,7 +87,6 @@ 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